jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for test(@JvmStatic -> const), fix for prototype assign

Browse Source
This commit is contained in:
Simon Ogorodnik
2016-10-12 11:52:54 +03:00
parent e84f56348c
commit df0dddedc2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
View File

@@ -311,7 +311,7 @@ class Converter private constructor(
//TODO: annotations from getter/setter?
val annotations = field?.let { convertAnnotations(it) } ?: Annotations.Empty
val modifiers = propertyInfo.modifiers + (field?.let{ specialModifiersCase(field) } ?: Modifiers.Empty)
val modifiers = (propertyInfo.modifiers + (field?.let{ specialModifiersCase(field) } ?: Modifiers.Empty))
val name = propertyInfo.identifier
if (field is PsiEnumConstant) {

2
j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
View File

@@ -68,7 +68,7 @@ class Modifiers(modifiers: Collection<Modifier>) : Element() {
fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS }
operator fun plus(other: Modifiers): Modifiers {
return Modifiers(this.modifiers + other.modifiers).assignNoPrototype()
return Modifiers(this.modifiers + other.modifiers).assignPrototypesFrom(this)
}
companion object {

2
j2k/testData/fileOrElement/issues/kt-837.kt vendored
View File

@@ -11,6 +11,6 @@ class Language(protected var code: String) : Serializable {
companion object {
var ENGLISH = Language("en")
var SWEDISH = Language("sv")
@JvmStatic private val serialVersionUID = -2442762969929206780L
private const val serialVersionUID = -2442762969929206780L
}
}