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

New J2K: Fix RemoveRedundantExpressionQualifierProcessing

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-13 14:59:49 +03:00
committed by Ilya Kirillov
parent 6f7f516a4f
commit 0610583b80
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
+2 -3
View File
@@ -756,9 +756,8 @@ object NewJ2KPostProcessingRegistrar {
private fun check(qualifiedExpression: KtQualifiedExpression): Boolean { private fun check(qualifiedExpression: KtQualifiedExpression): Boolean {
val qualifier = (qualifiedExpression.receiverExpression as? KtNameReferenceExpression) val qualifier = (qualifiedExpression.receiverExpression as? KtNameReferenceExpression)
?.referenceExpression() ?.referenceExpression()
?.resolve() as? KtClassOrObject ?: return false ?.resolve()?.safeAs<KtClassOrObject>()?.parentClassForCompanionOrThis() ?: return false
val topLevelClass = qualifiedExpression.getStrictParentOfType<KtClassOrObject>() ?: return false return qualifier.parentClassForCompanionOrThis() in qualifiedExpression.parentsOfType<KtClassOrObject>()
return topLevelClass == qualifier
} }
override fun createAction(element: PsiElement, diagnostics: Diagnostics): (() -> Unit)? { override fun createAction(element: PsiElement, diagnostics: Diagnostics): (() -> Unit)? {