Fixed issue converting lists

angelolloqui · Mar 21, 2020 · 7d1c0bf · 7d1c0bf
1 parent 54093fc
commit 7d1c0bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Assets/Tests/KotlinTokenizer/foundation_types.kt b/Assets/Tests/KotlinTokenizer/foundation_types.kt
@@ -12,3 +12,4 @@ var map: Promise<Map<Int, String>>? = null
 var map: Map<Int, Promise<Map<String, String>>>
 var map = mapOf(1 to "a", 2 to "b")
 var map = mapOf<String , String>()
+method(value = listOf("value1", "value"))
diff --git a/Assets/Tests/KotlinTokenizer/foundation_types.swift b/Assets/Tests/KotlinTokenizer/foundation_types.swift
@@ -12,3 +12,4 @@ var map: Promise<[Int: String]>?
 var map: [Int: Promise<[String: String]>]
 var map = [1: "a", 2: "b"]
 var map = [String: String]()
+method(value: ["value1", "value"])
diff --git a/Sources/SwiftKotlinFramework/KotlinTokenizer.swift b/Sources/SwiftKotlinFramework/KotlinTokenizer.swift
@@ -588,12 +588,11 @@ public class KotlinTokenizer: SwiftTokenizer {
         case let .staticString(_, rawText):
             return [expression.newToken(.string, conversionUnicodeString(rawText, node: expression))]
         case .array(let exprs):
-            let isGenericTypeInfo = expression.lexicalParent is FunctionCallExpression
-            return
-                expression.newToken(.identifier, "listOf") +
-                    expression.newToken(.startOfScope, isGenericTypeInfo ? "<" : "(") +
+            let isGenericTypeInfo = (expression.lexicalParent as? FunctionCallExpression)?.postfixExpression.textDescription.starts(with: "[") == true
+            return expression.newToken(.identifier, "listOf") +
+                expression.newToken(.startOfScope, isGenericTypeInfo ? "<" : "(") +
                 exprs.map { tokenize($0) }.joined(token: expression.newToken(.delimiter, ", ")) +
-                    expression.newToken(.endOfScope, isGenericTypeInfo ? ">" : ")")
+                expression.newToken(.endOfScope, isGenericTypeInfo ? ">" : ")")
         case .dictionary(let entries):
             let isGenericTypeInfo = expression.lexicalParent is FunctionCallExpression
             var entryTokens = entries.map { tokenize($0, node: expression) }.joined(token: expression.newToken(.delimiter, ", "))