Extract 'this'-like value parameters

tamasvajk · igfoo · commit 575e5134bbb8 · 2022-05-10T18:45:58.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -360,6 +360,9 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
             }
         }
         c.declarations.map { extractDeclaration(it, Optional.of(id)) }
+        if (c.thisReceiver != null) {
+            logger.warnElement(Severity.ErrorSevere, "'thisReceiver' is not extracted", c)
+        }
         return id
     }
 
@@ -446,6 +449,14 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
         f.valueParameters.forEachIndexed { i, vp ->
             extractValueParameter(vp, id, i)
         }
+
+        if (f.dispatchReceiverParameter != null) {
+            extractValueParameter(f.dispatchReceiverParameter!!, id, -1)
+        }
+
+        if (f.extensionReceiverParameter != null) {
+            extractValueParameter(f.extensionReceiverParameter!!, id, -1)
+        }
     }
 
     private fun getPropertyLabel(p: IrProperty) : String {

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,9 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`c.declarations.map { extractDeclaration(it, Optional.of(id)) }`
	`363`	`+ if (c.thisReceiver != null) {`
	`364`	`+ logger.warnElement(Severity.ErrorSevere, "'thisReceiver' is not extracted", c)`
	`365`	`+ }`
`363`	`366`	`return id`
`364`	`367`	`}`
`365`	`368`
`@@ -446,6 +449,14 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi`
`446`	`449`	`f.valueParameters.forEachIndexed { i, vp ->`
`447`	`450`	`extractValueParameter(vp, id, i)`
`448`	`451`	`}`
	`452`	`+`
	`453`	`+ if (f.dispatchReceiverParameter != null) {`
	`454`	`+ extractValueParameter(f.dispatchReceiverParameter!!, id, -1)`
	`455`	`+ }`
	`456`	`+`
	`457`	`+ if (f.extensionReceiverParameter != null) {`
	`458`	`+ extractValueParameter(f.extensionReceiverParameter!!, id, -1)`
	`459`	`+ }`
`449`	`460`	`}`
`450`	`461`
`451`	`462`	`private fun getPropertyLabel(p: IrProperty) : String {`