Skip to content

Commit cac293e

Browse files
committed
Use short form for simple Kotlin functions
for @abesto
1 parent 46dcae5 commit cac293e

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

spaghetti-kotlin-support/src/main/groovy/com/prezi/spaghetti/kotlin/KotlinEnumGeneratorVisitor.groovy

+4-12
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,13 @@ ${values.join("\n")}
2020
private val _values = arrayListOf(${node.values.join(", ")})
2121
private val _names = arrayListOf(${node.values.collect { "\"${it}\"" }.join(", ")})
2222
23-
fun names():Array<String> {
24-
return _names.copyToArray()
25-
}
23+
fun names():Array<String> = _names.copyToArray()
2624
27-
fun values():Array<${enumName}> {
28-
return _values.copyToArray()
29-
}
25+
fun values():Array<${enumName}> = _values.copyToArray()
3026
31-
fun getName(value:${enumName}):String {
32-
return _names.get(value as Int)
33-
}
27+
fun getName(value:${enumName}):String = _names.get(value as Int)
3428
35-
fun getValue(value:${enumName}):Int {
36-
return value as Int
37-
}
29+
fun getValue(value:${enumName}):Int = value as Int
3830
3931
fun fromValue(value:Int):${enumName} {
4032
if (value < 0 || value >= _values.size) {

spaghetti-kotlin-support/src/test/groovy/com/prezi/spaghetti/kotlin/KotlinEnumGeneratorVisitorTest.groovy

+4-12
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,13 @@ class KotlinEnumGeneratorVisitorTest extends AstTestBase {
3535
private val _values = arrayListOf(ALMA, BELA, GEZA)
3636
private val _names = arrayListOf("ALMA", "BELA", "GEZA")
3737
38-
fun names():Array<String> {
39-
return _names.copyToArray()
40-
}
38+
fun names():Array<String> = _names.copyToArray()
4139
42-
fun values():Array<MyEnum> {
43-
return _values.copyToArray()
44-
}
40+
fun values():Array<MyEnum> = _values.copyToArray()
4541
46-
fun getName(value:MyEnum):String {
47-
return _names.get(value as Int)
48-
}
42+
fun getName(value:MyEnum):String = _names.get(value as Int)
4943
50-
fun getValue(value:MyEnum):Int {
51-
return value as Int
52-
}
44+
fun getValue(value:MyEnum):Int = value as Int
5345
5446
fun fromValue(value:Int):MyEnum {
5547
if (value < 0 || value >= _values.size) {

0 commit comments

Comments
 (0)