single-expressions.9 : Lift return

Duncan McGregor · dmcg · commit 66db2a28c81f · 2021-06-23T10:16:26.000+01:00
diff --git a/src/main/java/travelator/EmailAddress.kt b/src/main/java/travelator/EmailAddress.kt
@@ -13,8 +13,8 @@ data class EmailAddress(
             return emailAddress(value, value.lastIndexOf('@'))
         }
 
-        private fun emailAddress(value: String, atIndex: Int): EmailAddress {
-            return if ((atIndex < 1 || atIndex == value.length - 1)) {
+        private fun emailAddress(value: String, atIndex: Int): EmailAddress =
+            if ((atIndex < 1 || atIndex == value.length - 1)) {
                 throw IllegalArgumentException(
                     "EmailAddress must be two parts separated by @"
                 )
@@ -24,6 +24,5 @@ data class EmailAddress(
                     value.substring(atIndex + 1)
                 )
             }
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ data class EmailAddress(`
`13`	`13`	`return emailAddress(value, value.lastIndexOf('@'))`
`14`	`14`	`}`
`15`	`15`
`16`		`- private fun emailAddress(value: String, atIndex: Int): EmailAddress {`
`17`		`- return if ((atIndex < 1 \|\| atIndex == value.length - 1)) {`
	`16`	`+ private fun emailAddress(value: String, atIndex: Int): EmailAddress =`
	`17`	`+ if ((atIndex < 1 \|\| atIndex == value.length - 1)) {`
`18`	`18`	`throw IllegalArgumentException(`
`19`	`19`	`"EmailAddress must be two parts separated by @"`
`20`	`20`	`)`
`@@ -24,6 +24,5 @@ data class EmailAddress(`
`24`	`24`	`value.substring(atIndex + 1)`
`25`	`25`	`)`
`26`	`26`	`}`
`27`		`- }`
`28`	`27`	`}`
`29`	`28`	`}`