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

181: Uast: don't use com.intellij.psi.util.parentOfType (KT-22734)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-02-07 14:54:43 +03:00
committed by Nikolay Krasko
parent 3fd9ec1b18
commit 7e5b417955
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt.181
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.Key
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement
import com.intellij.psi.util.parentOfType
import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.LightClassUtil
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
@@ -359,7 +358,7 @@ internal object KotlinConverter {
else -> { else -> {
if (element is LeafPsiElement) { if (element is LeafPsiElement) {
if (element.elementType in identifiersTokens) if (element.elementType in identifiersTokens)
if (element.elementType != KtTokens.OBJECT_KEYWORD || element.parentOfType<KtObjectDeclaration>()?.nameIdentifier == null) if (element.elementType != KtTokens.OBJECT_KEYWORD || element.getParentOfType<KtObjectDeclaration>(false)?.nameIdentifier == null)
el<UIdentifier>(build(::KotlinUIdentifier)) el<UIdentifier>(build(::KotlinUIdentifier))
else null else null
else if (element.elementType == KtTokens.LBRACKET && element.parent is KtCollectionLiteralExpression) else if (element.elementType == KtTokens.LBRACKET && element.parent is KtCollectionLiteralExpression)