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

Message corrected for warning "some modifier is redundant because another is present"

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-04-06 18:35:46 +03:00
parent d79e3f322f
commit 1b2deb8a8a
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+2 -2
View File
@@ -202,9 +202,9 @@ object ModifierCheckerCore {
trace.report(Errors.REPEATED_MODIFIER.on (secondNode.psi, first))
}
Compatibility.REDUNDANT ->
trace.report(Errors.REDUNDANT_MODIFIER.on(secondNode.psi, first, second))
trace.report(Errors.REDUNDANT_MODIFIER.on(secondNode.psi, second, first))
Compatibility.REVERSE_REDUNDANT ->
trace.report(Errors.REDUNDANT_MODIFIER.on(firstNode.psi, second, first))
trace.report(Errors.REDUNDANT_MODIFIER.on(firstNode.psi, first, second))
Compatibility.DEPRECATED -> {
trace.report(Errors.DEPRECATED_MODIFIER_PAIR.on(firstNode.psi, first, second))
trace.report(Errors.DEPRECATED_MODIFIER_PAIR.on(secondNode.psi, second, first))
idea/testData/checker/MultipleModality.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
sealed <warning descr="[REDUNDANT_MODIFIER] Modifier 'abstract' is redundant because 'sealed' is present">abstract</warning> class First
<warning descr="[REDUNDANT_MODIFIER] Modifier 'abstract' is redundant because 'sealed' is present">abstract</warning> sealed class Second
abstract class Base {
abstract <warning descr="[REDUNDANT_MODIFIER] Modifier 'open' is redundant because 'abstract' is present">open</warning> fun foo()
<warning descr="[REDUNDANT_MODIFIER] Modifier 'open' is redundant because 'abstract' is present">open</warning> abstract val name: String
}
idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
+6
View File
@@ -193,6 +193,12 @@ public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest {
doTest(fileName);
}
@TestMetadata("MultipleModality.kt")
public void testMultipleModality() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/MultipleModality.kt");
doTest(fileName);
}
@TestMetadata("NestedObjects.kt")
public void testNestedObjects() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt");