Do not report CONFLICTING_JVM_DECLARATIONS on delegated origin element · 377209f0c3 - kotlin-fork - Azalea's Gitea

azalea/kotlin-fork

Do not report CONFLICTING_JVM_DECLARATIONS on delegated origin element

This commit is contained in:

Nikolay Krasko

2015-02-24 21:33:55 +03:00

parent c6f8a1cfcc

commit 377209f0c3

9 changed files with 37 additions and 19 deletions

									
										compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt
									
		+1
		-1
	
												View File
												
				@@ -2,6 +2,6 @@ trait T {

				    fun getX() = 1

				}

				class C : T {

				class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {

				    <!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1

				}