Merge pull request #9401 from tamasvajk/kotlin-cleanup

tamasvajk · web-flow · commit d7b06aa2ba03 · 2022-06-02T10:24:17.000+02:00
Kotlin: Reuse `codeQlWithHasQuestionMark`
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -1328,7 +1328,7 @@ open class KotlinUsesExtractor(
             if (t.isArray() || t.isNullableArray()) {
                 val elementType = t.getArrayElementType(pluginContext.irBuiltIns)
                 val erasedElementType = erase(elementType)
-                return withQuestionMark((classifier as IrClassSymbol).typeWith(erasedElementType), t.hasQuestionMark)
+                return (classifier as IrClassSymbol).typeWith(erasedElementType).codeQlWithHasQuestionMark(t.hasQuestionMark)
             }
 
             if (owner is IrClass) {
@@ -1452,6 +1452,4 @@ open class KotlinUsesExtractor(
         return tw.getVariableLabelFor<DbLocalvar>(v)
     }
 
-    fun withQuestionMark(t: IrType, hasQuestionMark: Boolean) = if(hasQuestionMark) t.makeNullable() else t.makeNotNull()
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1328,7 +1328,7 @@ open class KotlinUsesExtractor(`
`1328`	`1328`	`if (t.isArray() \|\| t.isNullableArray()) {`
`1329`	`1329`	`val elementType = t.getArrayElementType(pluginContext.irBuiltIns)`
`1330`	`1330`	`val erasedElementType = erase(elementType)`
`1331`		`- return withQuestionMark((classifier as IrClassSymbol).typeWith(erasedElementType), t.hasQuestionMark)`
	`1331`	`+ return (classifier as IrClassSymbol).typeWith(erasedElementType).codeQlWithHasQuestionMark(t.hasQuestionMark)`
`1332`	`1332`	`}`
`1333`	`1333`
`1334`	`1334`	`if (owner is IrClass) {`
`@@ -1452,6 +1452,4 @@ open class KotlinUsesExtractor(`
`1452`	`1452`	`return tw.getVariableLabelFor<DbLocalvar>(v)`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`		`- fun withQuestionMark(t: IrType, hasQuestionMark: Boolean) = if(hasQuestionMark) t.makeNullable() else t.makeNotNull()`
`1456`		`-`
`1457`	`1455`	`}`