Kotlin: extract protected modifier from java class files

tamasvajk · tamasvajk · commit f2e2e3bc1d73 · 2022-10-10T18:02:21.000+02:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -231,7 +231,7 @@ open class KotlinFileExtractor(
                             // default java visibility (top level)
                         }
                         JavaVisibilities.ProtectedAndPackage -> {
-                            // default java visibility (member level)
+                            addModifiers(id, "protected")
                         }
                         else -> logger.errorElement("Unexpected delegated visibility: $v", elementForLocation)
                     }
diff --git a/java/ql/integration-tests/posix-only/kotlin/java_modifiers/test.expected b/java/ql/integration-tests/posix-only/kotlin/java_modifiers/test.expected
@@ -1,2 +1,2 @@
-| extlib.jar/extlib/A.class:0:0:0:0 | m |  |
+| extlib.jar/extlib/A.class:0:0:0:0 | m | protected |
 | test.kt:4:12:4:22 | m | override, protected |

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ open class KotlinFileExtractor(`
`231`	`231`	`// default java visibility (top level)`
`232`	`232`	`}`
`233`	`233`	`JavaVisibilities.ProtectedAndPackage -> {`
`234`		`- // default java visibility (member level)`
	`234`	`+ addModifiers(id, "protected")`
`235`	`235`	`}`
`236`	`236`	`else -> logger.errorElement("Unexpected delegated visibility: $v", elementForLocation)`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-\| extlib.jar/extlib/A.class:0:0:0:0 \| m \| \|`
	`1`	`+\| extlib.jar/extlib/A.class:0:0:0:0 \| m \| protected \|`
`2`	`2`	`\| test.kt:4:12:4:22 \| m \| override, protected \|`