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

Minor changes on code review

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-10 16:23:51 +03:00
parent 8942780640
commit fd1ff51233
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
+1 -2
View File
@@ -64,8 +64,7 @@ class ImportAllMembersIntention : SelfTargetingIntention<KtDotQualifiedExpressio
val qualifiedExpressions = element.getContainingKtFile().collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression -> val qualifiedExpressions = element.getContainingKtFile().collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression ->
val qualifierName = qualifiedExpression.receiverExpression.getQualifiedElementSelector() as? KtNameReferenceExpression val qualifierName = qualifiedExpression.receiverExpression.getQualifiedElementSelector() as? KtNameReferenceExpression
?: return@collectDescendantsOfType false qualifierName?.getReferencedNameAsName() == classFqName.shortName() && target(qualifiedExpression)?.importableFqName?.parent() == classFqName
qualifierName.getReferencedNameAsName() == classFqName.shortName() && target(qualifiedExpression)?.importableFqName?.parent() == classFqName
} }
//TODO: not deep //TODO: not deep
idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
+1 -2
View File
@@ -57,8 +57,7 @@ class ImportMemberIntention : SelfTargetingOffsetIndependentIntention<KtNameRefe
val qualifiedExpressions = file.collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression -> val qualifiedExpressions = file.collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression ->
val selector = qualifiedExpression.getQualifiedElementSelector() as? KtNameReferenceExpression val selector = qualifiedExpression.getQualifiedElementSelector() as? KtNameReferenceExpression
?: return@collectDescendantsOfType false selector?.getReferencedNameAsName() == fqName.shortName() && targetFqName(qualifiedExpression) == fqName
selector.getReferencedNameAsName() == fqName.shortName() && targetFqName(qualifiedExpression) == fqName
} }
//TODO: not deep //TODO: not deep