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

Minor: fixed tests.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-07-09 17:23:24 +04:00
parent 189080e624
commit c51b653b31
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.java
+4
View File
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
@@ -176,6 +177,9 @@ class CompletionSession {
if (descriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
if (KotlinBuiltIns.getInstance().isUnit(classDescriptor.getDefaultType())) return true;
ClassKind kind = classDescriptor.getKind();
return !(kind == ClassKind.OBJECT || kind == ClassKind.CLASS_OBJECT);
}
idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+4 -4
View File
@@ -174,14 +174,14 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
@Nullable
private DeclarationDescriptor findCurrentDescriptorForClass(@NotNull ClassDescriptor originalDescriptor) {
if (originalDescriptor.getKind().isSingleton()) {
// BindingContext doesn't contain an information about class descriptor of class object. For example see testEmptyRange.
if (DescriptorUtils.isClassObject(originalDescriptor)) {
DeclarationDescriptor currentParent = findCurrentDescriptor(originalDescriptor.getContainingDeclaration());
if (currentParent == null) return null;
return ((ClassDescriptor) currentParent).getClassObjectDescriptor();
}
else {
return bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, DescriptorUtils.getFqName(originalDescriptor));
}
return bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, DescriptorUtils.getFqName(originalDescriptor));
}
@Nullable