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

Minor, inline only once-used methods

Browse Source
This commit is contained in:
Alexander Udalov
2014-03-04 19:04:58 +04:00
parent d5e9cadccf
commit af2a28c099
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java
+8 -3
View File
@@ -18,19 +18,24 @@ package org.jetbrains.jet.lang.resolve.java;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE;
public class JavaResolverPsiUtils { public class JavaResolverPsiUtils {
private JavaResolverPsiUtils() { private JavaResolverPsiUtils() {
} }
public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) { public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) {
return DescriptorResolverUtils.isCompiledKotlinClass(new JavaClassImpl(psiClass)); JavaClass javaClass = new JavaClassImpl(psiClass);
return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_CLASS) != null;
} }
public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) { public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) {
return DescriptorResolverUtils.isCompiledKotlinPackageClass(new JavaClassImpl(psiClass)); JavaClass javaClass = new JavaClassImpl(psiClass);
return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_PACKAGE) != null;
} }
public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) { public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
-11
View File
@@ -34,23 +34,12 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.util.*; import java.util.*;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE;
public final class DescriptorResolverUtils { public final class DescriptorResolverUtils {
public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object"); public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object");
private DescriptorResolverUtils() { private DescriptorResolverUtils() {
} }
public static boolean isCompiledKotlinPackageClass(@NotNull JavaClass javaClass) {
return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_PACKAGE) != null;
}
public static boolean isCompiledKotlinClass(@NotNull JavaClass javaClass) {
return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_CLASS) != null;
}
@NotNull @NotNull
public static <D extends CallableMemberDescriptor> Collection<D> resolveOverrides( public static <D extends CallableMemberDescriptor> Collection<D> resolveOverrides(
@NotNull Name name, @NotNull Name name,