Get information about expect/actual for properties in K2 via Analysis API and not via PSI #3617
Conversation
… API and not via PSI
| @@ -740,8 +740,8 @@ private class DokkaDescriptorVisitor( | |||
| ): DFunction { | |||
| val dri = parent.copy(callable = Callable.from(descriptor)) | |||
| val isGetter = descriptor is PropertyGetterDescriptor | |||
| val isExpect = descriptor.isExpect | |||
| val isActual = descriptor.isActual | |||
| val isExpect = propertyDescriptor.isExpect | |||
There was a problem hiding this comment.
this is a minor fix for K1 compiler (just to make test easier).
descriptor of getter/setter in properties doesn't contain information about expect/actual (the same is true in K2, there is no such properties there).
So I've decided to make behaviour consistent. Not sure, that will affect anything rather than the model itself
There was a problem hiding this comment.
descriptor of getter/setter in properties doesn't contain information about expect/actual
isExpect/isActual always returns false for accessors.
What is about keeping the same behavior in K2 to avoid the change in Documentable model?
There was a problem hiding this comment.
yeah, that's also fine I believe. Do you mind if I will change it for K1 also to just use false instead of isExpect/isActual properties to make it more clear?
| multiplatformConfiguration.sourceSets.single { it.displayName == "common" }.sourceSetID | ||
|
|
||
| @Test | ||
| fun `should recognize expect property in class`() = testInline( |
There was a problem hiding this comment.
Can you emphasize that a declaration should be without the expect keyword, please?
There was a problem hiding this comment.
what do you mean? It's not possible to declare expect val/fun inside expect class/interface/etc
I've updated the test name, please take a look
| is KtKotlinPropertySymbol -> propertySymbol.isExpect to propertySymbol.isActual | ||
| is KtSyntheticJavaPropertySymbol -> false to false | ||
| } | ||
| val generics = propertySymbol.typeParameters.mapIndexed { index, symbol -> |
There was a problem hiding this comment.
Can you left the formatting unchanged for convenience, please?
| @@ -740,8 +740,8 @@ private class DokkaDescriptorVisitor( | |||
| ): DFunction { | |||
| val dri = parent.copy(callable = Callable.from(descriptor)) | |||
| val isGetter = descriptor is PropertyGetterDescriptor | |||
| val isExpect = descriptor.isExpect | |||
| val isActual = descriptor.isActual | |||
| val isExpect = propertyDescriptor.isExpect | |||
There was a problem hiding this comment.
descriptor of getter/setter in properties doesn't contain information about expect/actual
isExpect/isActual always returns false for accessors.
What is about keeping the same behavior in K2 to avoid the change in Documentable model?
fixes #3360
After short investigation I found out that the issue is on our side - we had our own extension properties for
expect/actualhandling which were using just PSI information.Accessors via Analysis API were added in https://youtrack.jetbrains.com/issue/KT-54846 (Fix in builds: 1.9.20-dev-7565).
There were no issues with functions, because
isExpect/isActualwere used there after update to Analysis API 1.9.20-* (because they were introduced as member properties and so they come before our extension properties during overload resolution). With properties the story is a bit different, because there is noisExpect/isActualforKtPropertySymbolwhich is used in our code, the exists only onKtKotlinPropertySymbolSo looks like upstream issue can be closed