diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt index e218b6b8bac..51254484ef3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt @@ -115,6 +115,9 @@ public object ModifierCheckerCore { result += incompatibilityRegister(CONST_KEYWORD, ABSTRACT_KEYWORD) result += incompatibilityRegister(CONST_KEYWORD, OPEN_KEYWORD) result += incompatibilityRegister(CONST_KEYWORD, OVERRIDE_KEYWORD) + + // private is incompatible with override + result += incompatibilityRegister(PRIVATE_KEYWORD, OVERRIDE_KEYWORD) return result } diff --git a/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out b/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out index 14a61d6dd91..7e40c2b5d7b 100644 --- a/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out +++ b/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out @@ -1,10 +1,13 @@ +compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:5: error: modifier 'override' is incompatible with 'private' + override protected private val c: Int + ^ compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: cannot weaken access privilege 'public' for 'c' in 'A' override protected private val c: Int ^ compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: modifier 'protected' is incompatible with 'private' override protected private val c: Int ^ -compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:24: error: modifier 'private' is incompatible with 'protected' +compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:24: error: modifier 'private' is incompatible with 'override' override protected private val c: Int ^ COMPILATION_ERROR diff --git a/compiler/testData/diagnostics/tests/scopes/kt151.kt b/compiler/testData/diagnostics/tests/scopes/kt151.kt index a5e83453fc1..1e0e07db876 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt151.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt151.kt @@ -32,7 +32,7 @@ class E : C(), T { } class F : C(), T { - private override fun foo() {} + private override fun foo() {} } class G : C(), T {