Change variable location extraction

tamasvajk · igfoo · commit b599ff279208 · 2022-05-10T19:51:12.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -626,9 +626,12 @@ open class KotlinFileExtractor(
     }
 
     private fun getVariableLocationProvider(v: IrVariable): IrElement {
-        if (v.origin == IrDeclarationOrigin.IR_TEMPORARY_VARIABLE) {
-            return v.initializer ?: v
+        val init = v.initializer
+        if (v.startOffset < 0 && init != null) {
+            // IR_TEMPORARY_VARIABLEs have no proper location
+            return init
         }
+
         return v
     }
 

Original file line number	Diff line number	Diff line change
`@@ -626,9 +626,12 @@ open class KotlinFileExtractor(`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`private fun getVariableLocationProvider(v: IrVariable): IrElement {`
`629`		`- if (v.origin == IrDeclarationOrigin.IR_TEMPORARY_VARIABLE) {`
`630`		`- return v.initializer ?: v`
	`629`	`+ val init = v.initializer`
	`630`	`+ if (v.startOffset < 0 && init != null) {`
	`631`	`+ // IR_TEMPORARY_VARIABLEs have no proper location`
	`632`	`+ return init`
`631`	`633`	`}`
	`634`	`+`
`632`	`635`	`return v`
`633`	`636`	`}`
`634`	`637`