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

Position error on 'class A' or 'object A' instead of name identifier only

Browse Source
This commit is contained in:
Svetlana Isakova
2014-08-12 15:26:42 +04:00
parent ac3528756c
commit f811b9541c
38 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.kt
+1 -1
View File
@@ -2,5 +2,5 @@ abstract class A {
abstract fun foo(): Int
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>B<!>() : A() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class B<!>() : A() {
}
compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.kt
+1 -1
View File
@@ -2,5 +2,5 @@ abstract class A {
abstract val i: Int
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>B<!>() : A() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class B<!>() : A() {
}
compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt
+1 -1
View File
@@ -2,5 +2,5 @@ abstract class A {
abstract var i: Int
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>B<!>() : A() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class B<!>() : A() {
}
compiler/testData/diagnostics/tests/override/ExtendFunctionClass.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package extendFunctionClass
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>A<!> : Function1<Int, Int> {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class A<!> : Function1<Int, Int> {
}
compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.kt
+1 -1
View File
@@ -6,6 +6,6 @@ open class B {
open fun f(): CharSequence = "charSequence"
}
class <!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>C<!> : B(), A
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class C<!> : B(), A
val obj: A = <!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>object<!> : B(), A {}
compiler/testData/diagnostics/tests/override/Generics.kt
+4 -4
View File
@@ -40,15 +40,15 @@ abstract class MyAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
override fun bar(t: String) = t
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass1<!><T> : MyTrait<T>, MyAbstractClass<T>() {}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass2<!><T, R>(r : R) : MyTrait<T>, MyAbstractClass<R>() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalGenericClass1<!><T> : MyTrait<T>, MyAbstractClass<T>() {}
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalGenericClass2<!><T, R>(r : R) : MyTrait<T>, MyAbstractClass<R>() {
<!NOTHING_TO_OVERRIDE!>override<!> fun foo(r: R) = r
<!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> pr : R<!> = r
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass1<!> : MyTrait<Int>, MyAbstractClass<String>() {}
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass1<!> : MyTrait<Int>, MyAbstractClass<String>() {}
abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass2<!><T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass2<!><T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
fun foo(t: T) = t
fun bar(t: T) = t
<!CONFLICTING_OVERLOADS!>val <R> pr : T<!> = t
compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt
+1 -1
View File
@@ -10,4 +10,4 @@ trait C {
fun foo(y: Int)
}
class <!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES!>Z<!> : A, B(), C
<!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE, DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES!>class Z<!> : A, B(), C
compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.kt
+2 -2
View File
@@ -6,5 +6,5 @@ trait Y {
fun foo(a : Int = 1)
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED, MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE!>Z1<!> : X, Y {} // BUG
object <!ABSTRACT_MEMBER_NOT_IMPLEMENTED, MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE!>Z1O<!> : X, Y {} // BUG
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED, MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE!>class Z1<!> : X, Y {} // BUG
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED, MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE!>object Z1O<!> : X, Y {} // BUG
compiler/testData/diagnostics/tests/override/NonGenerics.kt
+4 -4
View File
@@ -21,21 +21,21 @@ open class MyClass() : MyTrait, MyAbstractClass() {
class MyChildClass() : MyClass() {}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass<!> : MyTrait, MyAbstractClass() {}
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass<!> : MyTrait, MyAbstractClass() {}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass2<!>() : MyTrait, MyAbstractClass() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass2<!>() : MyTrait, MyAbstractClass() {
override fun foo() {}
override val pr : Unit = Unit
override val prr : Unit = Unit
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass3<!>() : MyTrait, MyAbstractClass() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass3<!>() : MyTrait, MyAbstractClass() {
override fun bar() {}
override val pr : Unit = Unit
override val prr : Unit = Unit
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass4<!>() : MyTrait, MyAbstractClass() {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass4<!>() : MyTrait, MyAbstractClass() {
<!VIRTUAL_MEMBER_HIDDEN!>fun foo()<!> {}
<!VIRTUAL_MEMBER_HIDDEN, MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val pr : Unit<!>
<!NOTHING_TO_OVERRIDE!>override<!> fun other() {}
compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.kt
+1 -1
View File
@@ -8,7 +8,7 @@ trait B {
fun foo() = 2
}
open class <!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>C<!> : A, B {}
open <!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class C<!> : A, B {}
trait E {
fun foo(): Int
compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt
+1 -1
View File
@@ -12,6 +12,6 @@ open class C {
private val a: String = ""
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>Subject<!> : C(), A, B {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Subject<!> : C(), A, B {
val c = a
}
compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.kt
+1 -1
View File
@@ -8,4 +8,4 @@ trait Bar {
fun foo(): Unit
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>Baz<!> : Foo, Bar
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Baz<!> : Foo, Bar
compiler/testData/diagnostics/tests/override/kt2052.kt
+1 -1
View File
@@ -4,7 +4,7 @@ trait Runnable {
class C {
fun f() {
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyRunnable<!>(): Runnable {
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class MyRunnable<!>(): Runnable {
}
}
}
compiler/testData/diagnostics/tests/override/kt4763.kt
+1 -1
View File
@@ -6,6 +6,6 @@ open class B {
open fun f(): CharSequence = "charSequence"
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>C<!> : B(), A
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class C<!> : B(), A
val d: A = <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>object<!> : B(), A {}
compiler/testData/diagnostics/tests/override/kt4763property.kt
+1 -1
View File
@@ -6,6 +6,6 @@ open class Q {
val x: Int = 42
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>R<!> : P, Q()
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class R<!> : P, Q()
val s: Q = <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>object<!> : Q(), P {}
compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.kt
+1 -1
View File
@@ -6,7 +6,7 @@ trait D {
fun foo(b : Int)
}
trait <!DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES!>E<!> : C, D
<!DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES!>trait E<!> : C, D
trait F : C, D {
override fun foo(<!PARAMETER_NAME_CHANGED_ON_OVERRIDE!>a<!> : Int) {