From c4bac83cc9713fcdc7356b2c78fb8e114507b247 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 17 Jun 2014 13:36:22 +0400 Subject: [PATCH] Java to Kotlin converter: working on not loosing comments - Element made Class instead of Trait --- .../org/jetbrains/jet/j2k/CommentConverter.kt | 58 +++++++++++++++++++ .../org/jetbrains/jet/j2k/ast/Annotation.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ast/Element.kt | 10 ++-- j2k/src/org/jetbrains/jet/j2k/ast/File.kt | 4 +- j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt | 4 +- .../jetbrains/jet/j2k/ast/LocalVariable.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ast/Members.kt | 2 +- .../org/jetbrains/jet/j2k/ast/Parameter.kt | 2 +- .../jetbrains/jet/j2k/ast/ParameterList.kt | 2 +- .../jetbrains/jet/j2k/ast/ReferenceElement.kt | 2 +- .../org/jetbrains/jet/j2k/ast/Statements.kt | 2 +- .../org/jetbrains/jet/j2k/ast/TypeElement.kt | 2 +- .../jetbrains/jet/j2k/ast/TypeParameters.kt | 9 +-- .../org/jetbrains/jet/j2k/ast/WhiteSpace.kt | 2 +- 14 files changed, 81 insertions(+), 22 deletions(-) create mode 100644 j2k/src/org/jetbrains/jet/j2k/CommentConverter.kt diff --git a/j2k/src/org/jetbrains/jet/j2k/CommentConverter.kt b/j2k/src/org/jetbrains/jet/j2k/CommentConverter.kt new file mode 100644 index 00000000000..eec149b07d1 --- /dev/null +++ b/j2k/src/org/jetbrains/jet/j2k/CommentConverter.kt @@ -0,0 +1,58 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.j2k + +import com.intellij.psi.* +import java.util.ArrayList +import org.jetbrains.jet.j2k.ast.Element + +class CommentConverter(private val topElement: PsiElement) { + private enum class CommentPlacement { + Before + SameLineBefore + SameLineAfter + After + } + + private class CommentInfo(val comment: PsiComment) { + val startOffset: Int + val endOffset: Int + var isAttached = false + + { + val range = comment.getTextRange()!! + startOffset = range.getStartOffset() + endOffset = range.getEndOffset() + } + } + + private val allComments: List = run { + val list = ArrayList() + topElement.accept(object : JavaRecursiveElementVisitor(){ + override fun visitComment(comment: PsiComment) { + list.add(CommentInfo(comment)) + } + }) + list + } + + /* + public fun toKotlin(elementToKotlin: () -> String, originalElements: List): String { + + } + */ +} diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Annotation.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Annotation.kt index d1632772225..37cd44175cf 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Annotation.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Annotation.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.j2k.ast import java.util.HashSet -class Annotation(val name: Identifier, val arguments: List>, val brackets: Boolean) : Element { +class Annotation(val name: Identifier, val arguments: List>, val brackets: Boolean) : Element() { private fun surroundWithBrackets(text: String) = if (brackets) "[$text]" else text override fun toKotlin(): String { diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt index 07a5282cf70..9ce7175baf5 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt @@ -16,17 +16,17 @@ package org.jetbrains.jet.j2k.ast -trait Element { - public fun toKotlin(): String +abstract class Element { + public abstract fun toKotlin(): String - public val isEmpty: Boolean get() = false + public open val isEmpty: Boolean get() = false - object Empty : Element { + object Empty : Element() { override fun toKotlin() = "" override val isEmpty: Boolean get() = true } } -class Comment(val text: String) : Element { +class Comment(val text: String) : Element() { override fun toKotlin() = text } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/File.kt b/j2k/src/org/jetbrains/jet/j2k/ast/File.kt index 351fbf149ce..2e625434767 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/File.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/File.kt @@ -18,14 +18,14 @@ package org.jetbrains.jet.j2k.ast class FileMemberList(elements: List) : WhiteSpaceSeparatedElementList(elements, WhiteSpace.NewLine, false) -class PackageStatement(val packageName: String) : Element { +class PackageStatement(val packageName: String) : Element() { override fun toKotlin(): String = "package " + packageName } class File( val body: FileMemberList, val mainFunction: String -) : Element { +) : Element() { override fun toKotlin(): String { return body.toKotlin() + mainFunction diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt index c1af1fd9b11..ce658abb8a2 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt @@ -24,11 +24,11 @@ import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap import com.intellij.psi.PsiJavaCodeReferenceElement import org.jetbrains.jet.asJava.KotlinLightClassForPackage -class Import(val name: String) : Element { +class Import(val name: String) : Element() { override fun toKotlin() = "import " + name } -class ImportList(public val imports: List) : Element { +class ImportList(public val imports: List) : Element() { override val isEmpty: Boolean get() = imports.isEmpty() diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt b/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt index 52cf1a7c575..c3668b6563d 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt @@ -26,7 +26,7 @@ class LocalVariable( private val initializer: Expression, private val isVal: Boolean, private val settings: ConverterSettings -) : Element { +) : Element() { override fun toKotlin(): String { val start = annotations.toKotlin() + if (isVal) "val" else "var" diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Members.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Members.kt index 7b74c695e09..abf43f9d002 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Members.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Members.kt @@ -30,7 +30,7 @@ class MemberComments(elements: List) : WhiteSpaceSeparatedElementList(e } } -abstract class Member(val comments: MemberComments, val annotations: Annotations, val modifiers: Set) : Element { +abstract class Member(val comments: MemberComments, val annotations: Annotations, val modifiers: Set) : Element() { fun commentsToKotlin(): String = comments.toKotlin() } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt index 70ce20c83ed..1e133700619 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt @@ -20,7 +20,7 @@ class Parameter(val identifier: Identifier, val `type`: Type, val varVal: Parameter.VarValModifier, val annotations: Annotations, - val modifiers: Collection) : Element { + val modifiers: Collection) : Element() { public enum class VarValModifier { None Val diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt index d87508ec2c5..f4b35a9cc3f 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.j2k.ast -open class ParameterList(val parameters: List) : Element { +open class ParameterList(val parameters: List) : Element() { override fun toKotlin() = parameters.map { it.toKotlin() }.makeString(", ") } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt index 4c551aa1176..b2045e8dd63 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt @@ -16,6 +16,6 @@ package org.jetbrains.jet.j2k.ast -class ReferenceElement(val reference: Identifier, val types: List) : Element { +class ReferenceElement(val reference: Identifier, val types: List) : Element() { override fun toKotlin() = reference.toKotlin() + types.toKotlin(", ", "<", ">") } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt index 3e1e786d122..577e66b663c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.j2k.ast -abstract class Statement() : Element { +abstract class Statement() : Element() { object Empty : Statement() { override fun toKotlin() = "" diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt index 5b0e8cc1bc7..320efd119b8 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.j2k.ast -class TypeElement(val `type`: Type) : Element { +class TypeElement(val `type`: Type) : Element() { override fun toKotlin() = `type`.toKotlin() fun toKotlinNotNull(): String = `type`.toNotNullType().toKotlin() diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/TypeParameters.kt b/j2k/src/org/jetbrains/jet/j2k/ast/TypeParameters.kt index a1d3b5bd199..87c1a0ef95c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/TypeParameters.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/TypeParameters.kt @@ -21,11 +21,12 @@ import org.jetbrains.jet.j2k.Converter import com.intellij.psi.PsiTypeParameterList import java.util.ArrayList -class TypeParameter(val name: Identifier, val extendsTypes: List) : Element { +class TypeParameter(val name: Identifier, val extendsTypes: List) : Element() { fun hasWhere(): Boolean = extendsTypes.size() > 1 + fun getWhereToKotlin(): String { if (hasWhere()) { - return name.toKotlin() + " : " + extendsTypes.get(1).toKotlin() + return name.toKotlin() + " : " + extendsTypes[1].toKotlin() } return "" @@ -33,14 +34,14 @@ class TypeParameter(val name: Identifier, val extendsTypes: List) : Elemen override fun toKotlin(): String { if (extendsTypes.size() > 0) { - return name.toKotlin() + " : " + extendsTypes [0].toKotlin() + return name.toKotlin() + " : " + extendsTypes[0].toKotlin() } return name.toKotlin() } } -class TypeParameterList(val parameters: List) : Element { +class TypeParameterList(val parameters: List) : Element() { override fun toKotlin(): String = if (!parameters.isEmpty()) parameters.map { it.toKotlin() diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/WhiteSpace.kt b/j2k/src/org/jetbrains/jet/j2k/ast/WhiteSpace.kt index 4f0e275932a..3f5c1b8835c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/WhiteSpace.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/WhiteSpace.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.j2k.ast -class WhiteSpace(val text: String) : Element { +class WhiteSpace(val text: String) : Element() { override fun toKotlin() = text override val isEmpty: Boolean