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

Copy only nullability/mutability annotations to types

Browse Source 
Also don't render copied annotations
This commit is contained in:
Alexander Udalov
2015-04-10 18:50:12 +03:00
parent 3369da94e4
commit d7c810a4d0
7 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
package
internal fun A.foo(/*0*/ a: kotlin.Int): kotlin.Unit
internal fun [[ERROR : x]()] A.foo(/*0*/ a: [[ERROR : x]()] kotlin.Int): kotlin.Unit
internal final class A {
public constructor A()
compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
+3 -3
View File
@@ -1,10 +1,10 @@
package
package
a() internal fun <no name provided>(): kotlin.Unit
internal fun <no name provided>(): kotlin.Unit
internal fun outerFun(): kotlin.Unit
internal fun A.<no name provided>(): kotlin.Unit
internal fun A.<no name provided>(): kotlin.Unit
internal fun [a()] A.<no name provided>(): kotlin.Unit
internal trait A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -25,8 +25,8 @@ internal final class Outer {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal final fun A.<no name provided>(): kotlin.Unit
internal final fun B.<no name provided>(): kotlin.Unit
internal final fun [a()] A.<no name provided>(): kotlin.Unit
}
internal final annotation class a : kotlin.Annotation {
compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+2 -6
View File
@@ -58,12 +58,8 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
// TODO: add these annotations when they are retained at runtime
"kotlin.deprecated",
"kotlin.data",
"kotlin.inline",
"org.jetbrains.annotations.NotNull",
"org.jetbrains.annotations.Nullable",
"org.jetbrains.annotations.Mutable",
"org.jetbrains.annotations.ReadOnly"
).map { FqName(it) })
"kotlin.inline"
).map { FqName(it) } + JvmAnnotationNames.ANNOTATIONS_COPIED_TO_TYPES)
.setOverrideRenderingPolicy(DescriptorRenderer.OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE)
.setParameterNameRenderingPolicy(DescriptorRenderer.ParameterNameRenderingPolicy.NONE)
.setIncludePropertyConstant(false)