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

Synthetic extensions to take all annotations from original declarations

Browse Source 
#KT-9387 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-10-19 19:25:13 +03:00
parent a0ccd36377
commit 8e6b0a26bb
7 changed files with 124 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
+2 -3
View File
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeFirstWord
import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmart
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.*
@@ -276,7 +275,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager) : KtScopeImpl
descriptor.setType(propertyType, typeParameters, null, receiverType)
val getter = PropertyGetterDescriptorImpl(descriptor,
Annotations.EMPTY,
getMethod.annotations,
Modality.FINAL,
visibility,
false,
@@ -289,7 +288,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager) : KtScopeImpl
val setter = if (setMethod != null)
PropertySetterDescriptorImpl(descriptor,
Annotations.EMPTY,
setMethod.annotations,
Modality.FINAL,
syntheticExtensionVisibility(setMethod),
false,
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt
+1 -1
View File
@@ -99,7 +99,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : KtScope by KtSc
fun create(sourceFunction: FunctionDescriptor): MyFunctionDescriptor {
val descriptor = MyFunctionDescriptor(DescriptorUtils.getContainingModule(sourceFunction),
null,
Annotations.EMPTY, //TODO
sourceFunction.annotations,
sourceFunction.name,
CallableMemberDescriptor.Kind.SYNTHESIZED,
sourceFunction.source)