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

Remove incorrect @NotNull annotation on getIcon() (EA-79802)

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-04-18 17:31:32 +02:00
parent 03cef30717
commit a96eaa2fa9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
+2 -2
View File
@@ -31,8 +31,8 @@ import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.render
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import javax.swing.Icon
@@ -80,7 +80,7 @@ open class DescriptorMemberChooserObject(
MEMBER_RENDERER.render(descriptor)
}
fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon {
fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon? {
if (declaration != null && declaration.isValid) {
val isClass = declaration is PsiClass || declaration is KtClass
val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY