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

fixed cosmetic issues

Browse Source
This commit is contained in:
Vladimir Rudev
2012-11-06 22:07:04 +04:00
committed by Nikolay Krasko
parent 8cff709bfb
commit 5f5d375a36
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+1 -1
View File
@@ -82,7 +82,7 @@ public final class JetDescriptorIconProvider {
} }
if (descriptor.getContainingDeclaration() instanceof ClassDescriptor) { if (descriptor.getContainingDeclaration() instanceof ClassDescriptor) {
if (Modality.ABSTRACT == ((FunctionDescriptor) descriptor).getModality()) { if (Modality.ABSTRACT == functionDescriptor.getModality()) {
return PlatformIcons.ABSTRACT_METHOD_ICON; return PlatformIcons.ABSTRACT_METHOD_ICON;
} }
else { else {
idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight;
import com.intellij.codeInsight.generation.ClassMemberWithElement; import com.intellij.codeInsight.generation.ClassMemberWithElement;
import com.intellij.codeInsight.generation.MemberChooserObject; import com.intellij.codeInsight.generation.MemberChooserObject;
import com.intellij.openapi.util.Iconable;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMember; import com.intellij.psi.PsiMember;
@@ -52,7 +53,7 @@ public class DescriptorClassMember implements ClassMemberWithElement {
myDescriptor = descriptor; myDescriptor = descriptor;
if (myPsiElement.isValid()) { if (myPsiElement.isValid()) {
boolean isClass = myPsiElement instanceof PsiClass || myPsiElement instanceof JetClass; boolean isClass = myPsiElement instanceof PsiClass || myPsiElement instanceof JetClass;
int flags = isClass ? 0 : 1; int flags = isClass ? 0 : Iconable.ICON_FLAG_VISIBILITY;
if (myPsiElement instanceof JetDeclaration) { // kotlin declaration if (myPsiElement instanceof JetDeclaration) { // kotlin declaration
// visibility and abstraction better detect by a descriptor // visibility and abstraction better detect by a descriptor
icon = JetDescriptorIconProvider.getIcon(myDescriptor, flags); icon = JetDescriptorIconProvider.getIcon(myDescriptor, flags);