Kotlin: Small refactorings

igfoo · igfoo · commit a6d0dc77514c · 2022-05-10T19:51:13.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2525,12 +2525,11 @@ open class KotlinFileExtractor(
             }
 
             if (parent is IrFile) {
-                if (this.filePath == parent.path) {
-                    val fileId = extractFileClass(parent)
-                    tw.writeEnclInReftype(id, fileId)
-                } else {
+                if (this.filePath != parent.path) {
                     logger.warn(Severity.ErrorSevere, "Unexpected file parent found")
                 }
+                val fileId = extractFileClass(parent)
+                tw.writeEnclInReftype(id, fileId)
                 break
             }
 
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -116,7 +116,7 @@ open class KotlinUsesExtractor(
     /**
      * Gets a KotlinFileExtractor based on this one, except it attributes locations to the file that declares the given class.
      */
-    private fun withSourceFileOfClass(cls: IrClass): KotlinFileExtractor {
+    private fun withFileOfClass(cls: IrClass): KotlinFileExtractor {
         val clsFile = cls.fileOrNull
 
         if (isExternalDeclaration(cls) || clsFile == null) {
@@ -252,7 +252,7 @@ open class KotlinUsesExtractor(
         if (argsIncludingOuterClasses == null || argsIncludingOuterClasses.isNotEmpty()) {
             // If this is a generic type instantiation or a raw type then it has no
             // source entity, so we need to extract it here
-            val extractorWithCSource by lazy { this.withSourceFileOfClass(c) }
+            val extractorWithCSource by lazy { this.withFileOfClass(c) }
 
             if (!instanceSeenBefore) {
                 extractorWithCSource.extractClassInstance(c, argsIncludingOuterClasses)

Original file line number	Diff line number	Diff line change
`@@ -2525,12 +2525,11 @@ open class KotlinFileExtractor(`
`2525`	`2525`	`}`
`2526`	`2526`
`2527`	`2527`	`if (parent is IrFile) {`
`2528`		`- if (this.filePath == parent.path) {`
`2529`		`- val fileId = extractFileClass(parent)`
`2530`		`- tw.writeEnclInReftype(id, fileId)`
`2531`		`- } else {`
	`2528`	`+ if (this.filePath != parent.path) {`
`2532`	`2529`	`logger.warn(Severity.ErrorSevere, "Unexpected file parent found")`
`2533`	`2530`	`}`
	`2531`	`+ val fileId = extractFileClass(parent)`
	`2532`	`+ tw.writeEnclInReftype(id, fileId)`
`2534`	`2533`	`break`
`2535`	`2534`	`}`
`2536`	`2535`