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

Fixed completion for package, import directive and user type.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-12 20:52:18 +03:00
parent 81934b75c2
commit b51edf9004
6 changed files with 90 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
+7 -7
View File
@@ -91,7 +91,7 @@ public fun JetElement.getQualifiedElementSelector(): JetElement? {
public fun JetSimpleNameExpression.getReceiverExpression(): JetExpression? {
val parent = getParent()
when {
parent is JetQualifiedExpression && !isImportDirectiveExpression() -> {
parent is JetQualifiedExpression -> {
val receiverExpression = parent.getReceiverExpression()
// Name expression can't be receiver for itself
if (receiverExpression != this) {
@@ -342,12 +342,12 @@ public fun JetModifierListOwner.isPrivate(): Boolean = hasModifier(JetTokens.PRI
public fun JetSimpleNameExpression.isImportDirectiveExpression(): Boolean {
val parent = getParent()
if (parent == null) {
return false
}
else {
return parent is JetImportDirective || parent.getParent() is JetImportDirective
}
return parent is JetImportDirective || parent?.getParent() is JetImportDirective
}
public fun JetSimpleNameExpression.isPackageDirectiveExpression(): Boolean {
val parent = getParent()
return parent is JetPackageDirective || parent?.getParent() is JetPackageDirective
}
public fun JetExpression.isFunctionLiteralOutsideParentheses(): Boolean {