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

Fix redundant semicolon inspection before soft keywords

Browse Source 
Fixes few tests:
 - RedundantSemicolon.testBetweenSoftModifierKeywordAndDeclaration
 - RedundantSemicolon.testBetweenSoftModifierKeywordAndDeclaration2
 - RedundantSemicolon.testBetweenSoftModifierKeywordAndDeclaration3

 This bug was introduced in 741ebeb7b8
This commit is contained in:
Mikhail Zarechenskiy
2020-07-03 15:03:05 +03:00
parent a0ecfce7b7
commit 9a08085146
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSemicolonInspection.kt
+3 -3
View File
@@ -86,10 +86,10 @@ class RedundantSemicolonInspection : AbstractKotlinInspection(), CleanupLocalIns
return false // case with statement starting with '{' and call on the previous line return false // case with statement starting with '{' and call on the previous line
} }
return !isSemicolonAllowed(semicolon) return !isSemicolonRequired(semicolon)
} }
private fun isSemicolonAllowed(semicolon: PsiElement): Boolean { private fun isSemicolonRequired(semicolon: PsiElement): Boolean {
if (isRequiredForCompanion(semicolon)) { if (isRequiredForCompanion(semicolon)) {
return true return true
} }
@@ -99,7 +99,7 @@ class RedundantSemicolonInspection : AbstractKotlinInspection(), CleanupLocalIns
if (prevSibling.safeAs<KtNameReferenceExpression>()?.text in softModifierKeywords && nextSibling is KtDeclaration) { if (prevSibling.safeAs<KtNameReferenceExpression>()?.text in softModifierKeywords && nextSibling is KtDeclaration) {
// enum; class Foo // enum; class Foo
return false return true
} }
if (nextSibling is KtPrefixExpression && nextSibling.operationToken == KtTokens.EXCL) { if (nextSibling is KtPrefixExpression && nextSibling.operationToken == KtTokens.EXCL) {