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

Multiple errors of the same kind fixed

Browse Source
This commit is contained in:
Andrey Breslav
2011-09-27 12:35:03 +04:00
parent afad00fac5
commit cc68fcabc6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+1 -1
View File
@@ -261,7 +261,7 @@ public class OverrideResolver {
if (checkPropertyKind(overridden, true) && checkPropertyKind(declared, false) && !kindMismatchError) { if (checkPropertyKind(overridden, true) && checkPropertyKind(declared, false) && !kindMismatchError) {
context.getTrace().report(VAR_OVERRIDDEN_BY_VAL.on(member, ((JetProperty) member).getValOrVarNode(), (PropertyDescriptor) declared, (PropertyDescriptor) overridden)); context.getTrace().report(VAR_OVERRIDDEN_BY_VAL.on(member, ((JetProperty) member).getValOrVarNode(), (PropertyDescriptor) declared, (PropertyDescriptor) overridden));
typeMismatchError = true; kindMismatchError = true;
} }
} }
} }
idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet
+5 -1
View File
@@ -2,7 +2,11 @@ open class Var() {
open var v : Int = 1 open var v : Int = 1
} }
class Val() : Var() { trait VarT {
var v : Int
}
class Val() : Var(), VarT {
override <!VAR_OVERRIDDEN_BY_VAL!>val<!> v : Int = 1 override <!VAR_OVERRIDDEN_BY_VAL!>val<!> v : Int = 1
} }