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-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
+1 -1
View File
@@ -36,7 +36,7 @@ public final class KotlinDescriptorIconProvider {
private KotlinDescriptorIconProvider() { private KotlinDescriptorIconProvider() {
} }
@NotNull @Nullable
public static Icon getIcon(@NotNull DeclarationDescriptor descriptor, @Nullable PsiElement declaration, @Iconable.IconFlags int flags) { public static Icon getIcon(@NotNull DeclarationDescriptor descriptor, @Nullable PsiElement declaration, @Iconable.IconFlags int flags) {
if (declaration != null && !(declaration instanceof KtElement)) { if (declaration != null && !(declaration instanceof KtElement)) {
return declaration.getIcon(flags); return declaration.getIcon(flags);
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
+3 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.ui.LayeredIcon
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.completion.tryGetOffset import org.jetbrains.kotlin.idea.completion.tryGetOffset
import org.jetbrains.kotlin.idea.core.ArgumentPositionData import org.jetbrains.kotlin.idea.core.ArgumentPositionData
import org.jetbrains.kotlin.idea.core.ExpectedInfo import org.jetbrains.kotlin.idea.core.ExpectedInfo
@@ -82,8 +83,8 @@ class MultipleArgumentsItemProvider(
private fun createParametersLookupElement(variables: List<VariableDescriptor>, tail: Tail): LookupElement { private fun createParametersLookupElement(variables: List<VariableDescriptor>, tail: Tail): LookupElement {
val compoundIcon = LayeredIcon(2) val compoundIcon = LayeredIcon(2)
val firstIcon = KotlinDescriptorIconProvider.getIcon(variables.first(), null, 0) val firstIcon = KotlinDescriptorIconProvider.getIcon(variables.first(), null, 0) ?: KotlinIcons.PARAMETER
val lastIcon = KotlinDescriptorIconProvider.getIcon(variables.last(), null, 0) val lastIcon = KotlinDescriptorIconProvider.getIcon(variables.last(), null, 0) ?: KotlinIcons.PARAMETER
compoundIcon.setIcon(lastIcon, 0, 2 * firstIcon.iconWidth / 5, 0) compoundIcon.setIcon(lastIcon, 0, 2 * firstIcon.iconWidth / 5, 0)
compoundIcon.setIcon(firstIcon, 1, 0, 0) compoundIcon.setIcon(firstIcon, 1, 0, 0)
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.KtDeclaration
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.ClassifierNamePolicy import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.render import org.jetbrains.kotlin.renderer.render
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import javax.swing.Icon import javax.swing.Icon
@@ -80,7 +80,7 @@ open class DescriptorMemberChooserObject(
MEMBER_RENDERER.render(descriptor) MEMBER_RENDERER.render(descriptor)
} }
fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon { fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon? {
if (declaration != null && declaration.isValid) { if (declaration != null && declaration.isValid) {
val isClass = declaration is PsiClass || declaration is KtClass val isClass = declaration is PsiClass || declaration is KtClass
val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY