Kotlin: Remove another not-null-expression

igfoo · igfoo · commit 48e6b4c01bda · 2022-08-15T14:43:59.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -309,8 +309,12 @@ open class KotlinUsesExtractor(
                 f.valueParameters
             }
 
-            val paramTypes = parameters.map { useType(erase(it.type)) }
-            val signature = paramTypes.joinToString(separator = ",", prefix = "(", postfix = ")") { it.javaResult.signature!! }
+            val paramSigs = parameters.map { useType(erase(it.type)).javaResult.signature }.requireNoNullsOrNull()
+            if (paramSigs == null) {
+                logger.warn("Null signature for a parameter of ${f.name}")
+                return
+            }
+            val signature = paramSigs.joinToString(separator = ",", prefix = "(", postfix = ")")
             dependencyCollector?.addDependency(f, signature)
             externalClassExtractor.extractLater(f, signature)
         }

Original file line number	Diff line number	Diff line change
`@@ -309,8 +309,12 @@ open class KotlinUsesExtractor(`
`309`	`309`	`f.valueParameters`
`310`	`310`	`}`
`311`	`311`
`312`		`- val paramTypes = parameters.map { useType(erase(it.type)) }`
`313`		`- val signature = paramTypes.joinToString(separator = ",", prefix = "(", postfix = ")") { it.javaResult.signature!! }`
	`312`	`+ val paramSigs = parameters.map { useType(erase(it.type)).javaResult.signature }.requireNoNullsOrNull()`
	`313`	`+ if (paramSigs == null) {`
	`314`	`+ logger.warn("Null signature for a parameter of ${f.name}")`
	`315`	`+ return`
	`316`	`+ }`
	`317`	`+ val signature = paramSigs.joinToString(separator = ",", prefix = "(", postfix = ")")`
`314`	`318`	`dependencyCollector?.addDependency(f, signature)`
`315`	`319`	`externalClassExtractor.extractLater(f, signature)`
`316`	`320`	`}`