azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-44741: Improve handling of constants defined in companion objects

Browse Source
This commit is contained in:
Hung Nguyen
2021-12-16 21:57:08 +00:00
committed by nataliya.valtman
parent a900f2b66d
commit 9a995af0df
5 changed files with 65 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest.kt
+1 -11
View File
@@ -171,27 +171,17 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() {
Changes(
lookupSymbols = setOf(
LookupSymbol(name = "constantChangedType", scope = "com.example.SomeClass.CompanionObject"),
// TODO (Fix in next commit). Missing:
// LookupSymbol(name = "constantChangedValue", scope = "com.example.SomeClass.CompanionObject")
LookupSymbol(name = "constantChangedValue", scope = "com.example.SomeClass.CompanionObject"),
LookupSymbol(name = "inlineFunctionChangedSignature", scope = "com.example.SomeClass"),
LookupSymbol(name = "inlineFunctionChangedImplementation", scope = "com.example.SomeClass"),
LookupSymbol(name = SAM_LOOKUP_NAME.asString(), scope = "com.example.SomeClass"),
LookupSymbol(name = SAM_LOOKUP_NAME.asString(), scope = "com.example.SomeClass.CompanionObject"),
// TODO (Fix in next commit). Incorrect:
LookupSymbol(name = "constantChangedType", scope = "com.example.SomeClass"),
LookupSymbol(name = "constantChangedType", scope = "com.example.SomeClass.Companion"),
LookupSymbol(name = "constantChangedValue", scope = "com.example.SomeClass"),
LookupSymbol(name = "constantChangedValue", scope = "com.example.SomeClass.Companion"),
LookupSymbol(name = SAM_LOOKUP_NAME.asString(), scope = "com.example.SomeClass.Companion"),
),
fqNames = setOf(
"com.example.SomeClass",
"com.example.SomeClass.CompanionObject",
// TODO (Fix in next commit). Incorrect:
"com.example.SomeClass.Companion"
)
).assertEquals(changes)
}
compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/expected-snapshot/kotlin/com/example/SimpleClass.json
Vendored
+8
View File
@@ -34,6 +34,14 @@
"className$delegate": {
"initializer": {},
"_value": {}
},
"protoMapValue$delegate": {
"initializer": {},
"_value": {}
},
"protoData$delegate": {
"initializer": {},
"_value": {}
}
},
"supertypes": [