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

Incorrect 'inner' usage is diagnosed by parent, not by target

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-29 15:22:14 +03:00
parent 2109a6b760
commit 930402d910
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+2 -1
View File
@@ -53,7 +53,8 @@ public object ModifierCheckerCore {
OPEN_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, INTERFACE, MEMBER_PROPERTY, MEMBER_FUNCTION), OPEN_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, INTERFACE, MEMBER_PROPERTY, MEMBER_FUNCTION),
FINAL_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, ENUM_CLASS, OBJECT, MEMBER_PROPERTY, MEMBER_FUNCTION), FINAL_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, ENUM_CLASS, OBJECT, MEMBER_PROPERTY, MEMBER_FUNCTION),
SEALED_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS), SEALED_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS),
INNER_KEYWORD to EnumSet.of(INNER_CLASS), // We should have also CLASS_ONLY here because INNER_CLASS is not always perfectly identified
INNER_KEYWORD to EnumSet.of(CLASS_ONLY, INNER_CLASS),
OVERRIDE_KEYWORD to EnumSet.of(MEMBER_PROPERTY, MEMBER_FUNCTION), OVERRIDE_KEYWORD to EnumSet.of(MEMBER_PROPERTY, MEMBER_FUNCTION),
PRIVATE_KEYWORD to EnumSet.of(CLASS, MEMBER_FUNCTION, TOP_LEVEL_FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, PRIVATE_KEYWORD to EnumSet.of(CLASS, MEMBER_FUNCTION, TOP_LEVEL_FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER,
MEMBER_PROPERTY, TOP_LEVEL_PROPERTY, CONSTRUCTOR), MEMBER_PROPERTY, TOP_LEVEL_PROPERTY, CONSTRUCTOR),
compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.kt
Vendored
+1 -1
View File
@@ -1 +1 @@
<!WRONG_MODIFIER_TARGET, DEPRECATED_MODIFIER_PAIR!>inner<!> <!DEPRECATED_MODIFIER_PAIR!>data<!> class Outer(val x: Int) <!WRONG_MODIFIER_CONTAINING_DECLARATION, DEPRECATED_MODIFIER_PAIR!>inner<!> <!DEPRECATED_MODIFIER_PAIR!>data<!> class Outer(val x: Int)
compiler/testData/diagnostics/tests/inner/illegalModifier.kt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
<!WRONG_MODIFIER_TARGET!>inner<!> fun foo() {} <!WRONG_MODIFIER_TARGET!>inner<!> fun foo() {}
<!WRONG_MODIFIER_TARGET!>inner<!> val prop = 42 <!WRONG_MODIFIER_TARGET!>inner<!> val prop = 42
<!WRONG_MODIFIER_TARGET!>inner<!> class A <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class A
<!WRONG_MODIFIER_TARGET!>inner<!> interface B <!WRONG_MODIFIER_TARGET!>inner<!> interface B
<!WRONG_MODIFIER_TARGET!>inner<!> object C <!WRONG_MODIFIER_TARGET!>inner<!> object C
@@ -23,16 +23,16 @@ enum class H {
} }
interface K { interface K {
<!WRONG_MODIFIER_TARGET!>inner<!> class L <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class L
} }
object N { object N {
<!WRONG_MODIFIER_TARGET!>inner<!> class O <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class O
} }
class P { class P {
companion object { companion object {
<!WRONG_MODIFIER_TARGET!>inner<!> class Q <!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class Q
} }
} }