#26 Removed optional chaining in lambdas

angelolloqui · Feb 3, 2018 · b2fa60f · b2fa60f
1 parent f115fce
commit b2fa60f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Sources/SwiftKotlinFramework/KotlinTokenizer.swift b/Sources/SwiftKotlinFramework/KotlinTokenizer.swift
@@ -692,7 +692,14 @@ public class KotlinTokenizer: SwiftTokenizer {
         }
     }
 
-
+    open override func tokenize(_ expression: OptionalChainingExpression) -> [Token] {
+        var tokens = tokenize(expression.postfixExpression)
+        if tokens.last?.value != "this" {
+            tokens.append(expression.newToken(.symbol, "?"))
+        }
+        return tokens
+    }
+
     // MARK: - Types
     open override func tokenize(_ type: ArrayType, node: ASTNode) -> [Token] {
         return

diff --git a/Tests/SwiftKotlinFrameworkTests/Tests/KotlinTokenizer/lambdas.kt b/Tests/SwiftKotlinFrameworkTests/Tests/KotlinTokenizer/lambdas.kt
@@ -1,11 +1,11 @@
 userService.updateUser(picture = picture).always {  
-    this?.hasPhoto = true
+    this.hasPhoto = true
 }
 userService.autoLinkTenant(tenantId = tenant.id).then { _  -> 
-    this?.startPayment(paymentMethod, true)
+    this.startPayment(paymentMethod, true)
 }.catchError { _  -> 
-    val intent = this?.coordinator?.autoRegisterIntent(tenant = tenant, onComplete = { this?.startPayment(paymentMethod, true) })
-    this?.navigationManager?.show(intent, animation = .push)
+    val intent = this.coordinator.autoRegisterIntent(tenant = tenant, onComplete = { this.startPayment(paymentMethod, true) })
+    this.navigationManager.show(intent, animation = .push)
 }
 item.selectCallback = { option  -> 
     presenter.selectPaymentMethod(option)