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

Inlined method which was used only once, and in different subsystem.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-12 19:30:46 +04:00
parent 32a048674f
commit 5ad571c5ab
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java
+3 -2
View File
@@ -25,12 +25,13 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.asJava.KotlinLightClass; import org.jetbrains.jet.asJava.KotlinLightClass;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.caches.JetShortNamesCache; import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector;
import org.jetbrains.jet.plugin.libraries.DecompiledDataFactory;
public class JetTypesCompletionHelper { public class JetTypesCompletionHelper {
private JetTypesCompletionHelper() {} private JetTypesCompletionHelper() {}
@@ -89,7 +90,7 @@ public class JetTypesCompletionHelper {
} }
if (DescriptorResolverUtils.isKotlinClass(aClass)) { if (DescriptorResolverUtils.isKotlinClass(aClass)) {
if (!DecompiledDataFactory.isKotlinObject(aClass)) { if (JetClassAnnotation.get(aClass).kind() != JvmStdlibNames.FLAG_CLASS_KIND_OBJECT) {
String qualifiedName = aClass.getQualifiedName(); String qualifiedName = aClass.getQualifiedName();
if (qualifiedName != null) { if (qualifiedName != null) {
FqName fqName = new FqName(qualifiedName); FqName fqName = new FqName(qualifiedName);
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
-4
View File
@@ -210,8 +210,4 @@ public class DecompiledDataFactory {
} }
return false; return false;
} }
public static boolean isKotlinObject(PsiClass aClass) {
return JetClassAnnotation.get(aClass).kind() == JvmStdlibNames.FLAG_CLASS_KIND_OBJECT;
}
} }