github
diff --git a/‎java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt‎
Lines changed: 20 additions & 8 deletions b/‎java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt‎
Lines changed: 20 additions & 8 deletions
@@ -1231,7 +1231,7 @@ open class KotlinFileExtractor(
             if (dispatchReceiver != null) {
                 extractExpressionExpr(dispatchReceiver, enclosingCallable, id, -1, enclosingStmt)
             } else if (isStaticFunction(callTarget)) {
-                extractStaticCallTypeAccessQualifier(callTarget, id, locId, enclosingCallable, enclosingStmt)
+                extractStaticTypeAccessQualifier(callTarget, id, locId, enclosingCallable, enclosingStmt)
             }
         }
 
@@ -1250,14 +1250,26 @@ open class KotlinFileExtractor(
         extractCallValueArguments(argParent, valueArguments, enclosingStmt, enclosingCallable, idxOffset)
     }
 
-    private fun extractStaticCallTypeAccessQualifier(target: IrFunction, parentExpr: Label<out DbExprparent>, locId: Label<DbLocation>, enclosingCallable: Label<out DbCallable>, enclosingStmt: Label<out DbStmt>) {
-        if (target.isStaticMethodOfClass) {
+    private fun extractStaticTypeAccessQualifier(target: IrDeclaration, parentExpr: Label<out DbExprparent>, locId: Label<DbLocation>, enclosingCallable: Label<out DbCallable>, enclosingStmt: Label<out DbStmt>) {
+        if (target.isStaticOfClass) {
             extractTypeAccessRecursive(target.parentAsClass.toRawType(), locId, parentExpr, -1, enclosingCallable, enclosingStmt)
-        } else if (target is IrSimpleFunction && target.dispatchReceiverParameter == null && target.parent is IrFile) {
+        } else if (target.isStaticOfFile) {
             extractTypeAccess(useFileClassType(target.parent as IrFile), locId, parentExpr, -1, enclosingCallable, enclosingStmt)
         }
     }
 
+    private val IrDeclaration.isStaticOfClass: Boolean
+        get() = this.isStatic && parent is IrClass
+
+    private val IrDeclaration.isStaticOfFile: Boolean
+        get() = this.isStatic && parent is IrFile
+
+    private val IrDeclaration.isStatic: Boolean
+        get() = this is IrSimpleFunction && dispatchReceiverParameter == null ||
+                this is IrField && this.isStatic ||
+                this is IrEnumEntry
+
+
     private fun extractCallValueArguments(callId: Label<out DbExprparent>, call: IrFunctionAccessExpression, enclosingStmt: Label<out DbStmt>, enclosingCallable: Label<out DbCallable>, idxOffset: Int) =
         extractCallValueArguments(callId, (0 until call.valueArgumentsCount).map { call.getValueArgument(it) }, enclosingStmt, enclosingCallable, idxOffset)
 
@@ -2487,7 +2499,7 @@ open class KotlinFileExtractor(
                     if (receiver != null) {
                         extractExpressionExpr(receiver, callable, id, -1, exprParent.enclosingStmt)
                     } else if (owner.isStatic) {
-                        extractTypeAccessRecursive(owner.parentAsClass.toRawType(), locId, id, -1, callable, exprParent.enclosingStmt)
+                        extractStaticTypeAccessQualifier(owner, id, locId, callable, exprParent.enclosingStmt)
                     }
                 }
                 is IrGetEnumValue -> {
@@ -2514,7 +2526,7 @@ open class KotlinFileExtractor(
                     val vId = useEnumEntry(owner)
                     tw.writeVariableBinding(id, vId)
 
-                    extractTypeAccessRecursive(e.type, locId, id, -1, callable, exprParent.enclosingStmt)
+                    extractStaticTypeAccessQualifier(owner, id, locId, callable, exprParent.enclosingStmt)
                 }
                 is IrSetValue,
                 is IrSetField -> {
@@ -2576,7 +2588,7 @@ open class KotlinFileExtractor(
                             if (receiver != null) {
                                 extractExpressionExpr(receiver, callable, lhsId, -1, exprParent.enclosingStmt)
                             } else if (realField.isStatic) {
-                                extractTypeAccessRecursive(realField.parentAsClass.toRawType(), lhsLocId, lhsId, -1, callable, exprParent.enclosingStmt)
+                                extractStaticTypeAccessQualifier(realField, lhsId, lhsLocId, callable, exprParent.enclosingStmt)
                             }
                         }
                         else -> {
@@ -2988,7 +3000,7 @@ open class KotlinFileExtractor(
                     useFirstArgAsDispatch = target.owner.dispatchReceiverParameter != null
 
                     if (isStaticFunction(target.owner)) {
-                        extractStaticCallTypeAccessQualifier(target.owner, callId, locId, labels.methodId, retId)
+                        extractStaticTypeAccessQualifier(target.owner, callId, locId, labels.methodId, retId)
                     }
                 }
             }
Original file line number	Diff line number	Diff line change
`@@ -1231,7 +1231,7 @@ open class KotlinFileExtractor(`
`1231`	`1231`	`if (dispatchReceiver != null) {`
`1232`	`1232`	`extractExpressionExpr(dispatchReceiver, enclosingCallable, id, -1, enclosingStmt)`
`1233`	`1233`	`} else if (isStaticFunction(callTarget)) {`
`1234`		`- extractStaticCallTypeAccessQualifier(callTarget, id, locId, enclosingCallable, enclosingStmt)`
	`1234`	`+ extractStaticTypeAccessQualifier(callTarget, id, locId, enclosingCallable, enclosingStmt)`
`1235`	`1235`	`}`
`1236`	`1236`	`}`
`1237`	`1237`
`@@ -1250,14 +1250,26 @@ open class KotlinFileExtractor(`
`1250`	`1250`	`extractCallValueArguments(argParent, valueArguments, enclosingStmt, enclosingCallable, idxOffset)`
`1251`	`1251`	`}`
`1252`	`1252`
`1253`		`- private fun extractStaticCallTypeAccessQualifier(target: IrFunction, parentExpr: Label<out DbExprparent>, locId: Label<DbLocation>, enclosingCallable: Label<out DbCallable>, enclosingStmt: Label<out DbStmt>) {`
`1254`		`- if (target.isStaticMethodOfClass) {`
	`1253`	`+ private fun extractStaticTypeAccessQualifier(target: IrDeclaration, parentExpr: Label<out DbExprparent>, locId: Label<DbLocation>, enclosingCallable: Label<out DbCallable>, enclosingStmt: Label<out DbStmt>) {`
	`1254`	`+ if (target.isStaticOfClass) {`
`1255`	`1255`	`extractTypeAccessRecursive(target.parentAsClass.toRawType(), locId, parentExpr, -1, enclosingCallable, enclosingStmt)`
`1256`		`- } else if (target is IrSimpleFunction && target.dispatchReceiverParameter == null && target.parent is IrFile) {`
	`1256`	`+ } else if (target.isStaticOfFile) {`
`1257`	`1257`	`extractTypeAccess(useFileClassType(target.parent as IrFile), locId, parentExpr, -1, enclosingCallable, enclosingStmt)`
`1258`	`1258`	`}`
`1259`	`1259`	`}`
`1260`	`1260`
	`1261`	`+ private val IrDeclaration.isStaticOfClass: Boolean`
	`1262`	`+ get() = this.isStatic && parent is IrClass`
	`1263`	`+`
	`1264`	`+ private val IrDeclaration.isStaticOfFile: Boolean`
	`1265`	`+ get() = this.isStatic && parent is IrFile`
	`1266`	`+`
	`1267`	`+ private val IrDeclaration.isStatic: Boolean`
	`1268`	`+ get() = this is IrSimpleFunction && dispatchReceiverParameter == null \|\|`
	`1269`	`+ this is IrField && this.isStatic \|\|`
	`1270`	`+ this is IrEnumEntry`
	`1271`	`+`
	`1272`	`+`
`1261`	`1273`	`private fun extractCallValueArguments(callId: Label<out DbExprparent>, call: IrFunctionAccessExpression, enclosingStmt: Label<out DbStmt>, enclosingCallable: Label<out DbCallable>, idxOffset: Int) =`
`1262`	`1274`	`extractCallValueArguments(callId, (0 until call.valueArgumentsCount).map { call.getValueArgument(it) }, enclosingStmt, enclosingCallable, idxOffset)`
`1263`	`1275`
`@@ -2487,7 +2499,7 @@ open class KotlinFileExtractor(`
`2487`	`2499`	`if (receiver != null) {`
`2488`	`2500`	`extractExpressionExpr(receiver, callable, id, -1, exprParent.enclosingStmt)`
`2489`	`2501`	`} else if (owner.isStatic) {`
`2490`		`- extractTypeAccessRecursive(owner.parentAsClass.toRawType(), locId, id, -1, callable, exprParent.enclosingStmt)`
	`2502`	`+ extractStaticTypeAccessQualifier(owner, id, locId, callable, exprParent.enclosingStmt)`
`2491`	`2503`	`}`
`2492`	`2504`	`}`
`2493`	`2505`	`is IrGetEnumValue -> {`
`@@ -2514,7 +2526,7 @@ open class KotlinFileExtractor(`
`2514`	`2526`	`val vId = useEnumEntry(owner)`
`2515`	`2527`	`tw.writeVariableBinding(id, vId)`
`2516`	`2528`
`2517`		`- extractTypeAccessRecursive(e.type, locId, id, -1, callable, exprParent.enclosingStmt)`
	`2529`	`+ extractStaticTypeAccessQualifier(owner, id, locId, callable, exprParent.enclosingStmt)`
`2518`	`2530`	`}`
`2519`	`2531`	`is IrSetValue,`
`2520`	`2532`	`is IrSetField -> {`
`@@ -2576,7 +2588,7 @@ open class KotlinFileExtractor(`
`2576`	`2588`	`if (receiver != null) {`
`2577`	`2589`	`extractExpressionExpr(receiver, callable, lhsId, -1, exprParent.enclosingStmt)`
`2578`	`2590`	`} else if (realField.isStatic) {`
`2579`		`- extractTypeAccessRecursive(realField.parentAsClass.toRawType(), lhsLocId, lhsId, -1, callable, exprParent.enclosingStmt)`
	`2591`	`+ extractStaticTypeAccessQualifier(realField, lhsId, lhsLocId, callable, exprParent.enclosingStmt)`
`2580`	`2592`	`}`
`2581`	`2593`	`}`
`2582`	`2594`	`else -> {`
`@@ -2988,7 +3000,7 @@ open class KotlinFileExtractor(`
`2988`	`3000`	`useFirstArgAsDispatch = target.owner.dispatchReceiverParameter != null`
`2989`	`3001`
`2990`	`3002`	`if (isStaticFunction(target.owner)) {`
`2991`		`- extractStaticCallTypeAccessQualifier(target.owner, callId, locId, labels.methodId, retId)`
	`3003`	`+ extractStaticTypeAccessQualifier(target.owner, callId, locId, labels.methodId, retId)`
`2992`	`3004`	`}`
`2993`	`3005`	`}`
`2994`	`3006`	`}`