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

Minor: better Kotlin code

Browse Source
This commit is contained in:
Nikolay Krasko
2014-11-07 01:30:26 +03:00
parent d80c98a8ba
commit d5bef5e612
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt
+5 -5
View File
@@ -26,8 +26,8 @@ import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver
import java.util.HashSet import java.util.HashSet
import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor
import com.intellij.psi.JavaPsiFacade import com.intellij.psi.JavaPsiFacade
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.plugin.search.allScope
import org.jetbrains.jet.utils.addIfNotNull
public object DescriptorToDeclarationUtil { public object DescriptorToDeclarationUtil {
public fun getDeclaration(file: JetFile, descriptor: DeclarationDescriptor): PsiElement? { public fun getDeclaration(file: JetFile, descriptor: DeclarationDescriptor): PsiElement? {
@@ -53,9 +53,9 @@ public object DescriptorToDeclarationUtil {
if (originalDescriptor is PackageViewDescriptor) { if (originalDescriptor is PackageViewDescriptor) {
val psiFacade = JavaPsiFacade.getInstance(project) val psiFacade = JavaPsiFacade.getInstance(project)
val fqName = (originalDescriptor as PackageViewDescriptor).getFqName().asString() val fqName = originalDescriptor.getFqName().asString()
ContainerUtil.addIfNotNull(result, psiFacade.findPackage(fqName)) result.addIfNotNull(psiFacade.findPackage(fqName))
ContainerUtil.addIfNotNull(result, psiFacade.findClass(fqName, project.allScope())) result.addIfNotNull(psiFacade.findClass(fqName, project.allScope()))
} }
return result return result
} }
@@ -63,7 +63,7 @@ public object DescriptorToDeclarationUtil {
private fun findDecompiledAndBuiltInDeclarations(project: Project, descriptor: DeclarationDescriptor): Collection<PsiElement> { private fun findDecompiledAndBuiltInDeclarations(project: Project, descriptor: DeclarationDescriptor): Collection<PsiElement> {
val libraryReferenceResolver = project.getComponent(javaClass<BuiltInsReferenceResolver>()) val libraryReferenceResolver = project.getComponent(javaClass<BuiltInsReferenceResolver>())
val elements = libraryReferenceResolver!!.resolveBuiltInSymbol(descriptor) val elements = libraryReferenceResolver!!.resolveBuiltInSymbol(descriptor)
if (!elements.isEmpty()) { if (elements.isNotEmpty()) {
return elements return elements
} }