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

New J2K: minor, use firstNotNullResult in j2k reference resolver

Browse Source
This commit is contained in:
Ilya Kirillov
2020-02-25 13:05:51 +03:00
parent b7711678c2
commit b21a9476c0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
+4 -3
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiPolyVariantReference import com.intellij.psi.PsiPolyVariantReference
import com.intellij.psi.PsiReference
import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
@@ -20,6 +21,7 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
class JKResolver(val project: Project, module: Module?, private val contextElement: PsiElement) { class JKResolver(val project: Project, module: Module?, private val contextElement: PsiElement) {
@@ -76,9 +78,8 @@ class JKResolver(val project: Project, module: Module?, private val contextEleme
return constructImportDirectiveWithContext(fqName) return constructImportDirectiveWithContext(fqName)
.getChildOfType<KtDotQualifiedExpression>() .getChildOfType<KtDotQualifiedExpression>()
?.selectorExpression ?.selectorExpression
?.let { ?.references
it.references.mapNotNull { it.resolve() }.firstOrNull() ?.firstNotNullResult(PsiReference::resolve)
}
} }