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

Move method to JetPsiUtil

Browse Source
This commit is contained in:
Vladimir Rudev
2012-11-04 11:25:59 +04:00
committed by Nikolay Krasko
parent d9d4683989
commit 3cc92ad24c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+11 -6
View File
@@ -141,7 +141,7 @@ public class JetPsiUtil {
if (objectDeclaration == null) {
objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetEnumEntry.class);
}
if (objectDeclaration == null) {
return null;
}
@@ -166,7 +166,7 @@ public class JetPsiUtil {
}
else if (parent instanceof JetNamedFunction || parent instanceof JetClass) {
firstPart = getFQName((JetNamedDeclaration) parent);
}
}
else if (parent instanceof JetObjectDeclaration) {
if (parent.getParent() instanceof JetClassObject) {
JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(parent, JetClassOrObject.class);
@@ -215,7 +215,8 @@ public class JetPsiUtil {
return false;
}
@Nullable @IfNotParsed
@Nullable
@IfNotParsed
public static ImportPath getImportPath(JetImportDirective importDirective) {
final JetExpression importedReference = importDirective.getImportedReference();
if (importedReference == null) {
@@ -322,11 +323,11 @@ public class JetPsiUtil {
@Nullable
public static JetSimpleNameExpression getLastReference(@NotNull JetExpression importedReference) {
if (importedReference instanceof JetDotQualifiedExpression) {
JetExpression selectorExpression = ((JetDotQualifiedExpression)importedReference).getSelectorExpression();
return (selectorExpression instanceof JetSimpleNameExpression) ? (JetSimpleNameExpression)selectorExpression : null;
JetExpression selectorExpression = ((JetDotQualifiedExpression) importedReference).getSelectorExpression();
return (selectorExpression instanceof JetSimpleNameExpression) ? (JetSimpleNameExpression) selectorExpression : null;
}
if (importedReference instanceof JetSimpleNameExpression) {
return (JetSimpleNameExpression)importedReference;
return (JetSimpleNameExpression) importedReference;
}
return null;
}
@@ -418,4 +419,8 @@ public class JetPsiUtil {
JetExpression deparenthesized = deparenthesize(expression);
return deparenthesized instanceof JetConstantExpression && deparenthesized.getNode().getElementType() == JetNodeTypes.NULL;
}
public static boolean isAbstract(@NotNull JetDeclarationWithBody declaration) {
return declaration.getBodyExpression() == null;
}
}
idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
+3 -8
View File
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.JetLightClass;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lexer.JetTokens;
import javax.swing.*;
@@ -58,10 +57,6 @@ public class JetIconProvider extends IconProvider {
return null;
}
private static boolean isAbstract(@NotNull JetDeclarationWithBody declaration) {
return declaration.hasBlockBody() && declaration.getBodyExpression() == null;
}
@Override
public Icon getIcon(@NotNull PsiElement psiElement, int flags) {
if (psiElement instanceof JetFile) {
@@ -73,7 +68,7 @@ public class JetIconProvider extends IconProvider {
Icon result = getBaseIcon(psiElement);
if ((flags & Iconable.ICON_FLAG_VISIBILITY) > 0 && psiElement instanceof JetModifierListOwner) {
JetModifierList list = ((JetModifierListOwner) psiElement).getModifierList();
if (list!=null) {
if (list != null) {
RowIcon rowIcon = new RowIcon(2);
rowIcon.setIcon(result, 0);
rowIcon.setIcon(getVisibilityIcon(list), 1);
@@ -96,7 +91,7 @@ public class JetIconProvider extends IconProvider {
return PlatformIcons.PACKAGE_LOCAL_ICON;
}
private static Icon getBaseIcon(PsiElement psiElement) {
public static Icon getBaseIcon(PsiElement psiElement) {
if (psiElement instanceof JetNamespaceHeader) {
return PlatformIcons.PACKAGE_ICON;
}
@@ -106,7 +101,7 @@ public class JetIconProvider extends IconProvider {
}
if (PsiTreeUtil.getParentOfType(psiElement, JetNamedDeclaration.class) instanceof JetClass) {
if (isAbstract((JetFunction) psiElement)) {
if (JetPsiUtil.isAbstract((JetFunction) psiElement)) {
return PlatformIcons.ABSTRACT_METHOD_ICON;
}
else {