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

Extract methods

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-19 15:16:49 -08:00
committed by Evgeny Gerashchenko
parent 6874ab0ddc
commit 10d971bc7a
1 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+51 -27
View File
@@ -40,6 +40,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.plugin.JetIcons;
import java.awt.event.MouseEvent;
@@ -92,35 +93,10 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
continue;
}
PsiClass containingClass = member.getContainingClass();
if (containingClass == null) { // e.g., type parameter
continue;
}
DeclarationDescriptor memberDescriptor = getDescriptorForMember(javaDescriptorResolver, member, bindingContext);
String qualifiedName = containingClass.getQualifiedName();
assert qualifiedName != null;
if (memberDescriptor == null) continue;
FqName classFqName = new FqName(qualifiedName);
ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName);
assert klass != null : " Couldn't find class " + classFqName;
String memberNameAsString = member.getName();
assert memberNameAsString != null;
Name name = Name.identifier(memberNameAsString);
if (element instanceof PsiMethod) {
klass.getDefaultType().getMemberScope().getFunctions(name);
}
else if (element instanceof PsiField) {
klass.getDefaultType().getMemberScope().getProperties(name);
}
else {
continue;
}
PsiModifierListOwner annotationOwner = getAnnotationOwner(element);
DeclarationDescriptor memberDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotationOwner);
assert memberDescriptor != null : "Couldn't find descriptor for " + annotationOwner;
List<String> errors = bindingContext.get(BindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, memberDescriptor);
boolean hasSignatureAnnotation = findKotlinSignatureAnnotation(element) != null;
@@ -130,6 +106,54 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
}
}
@Nullable
private static DeclarationDescriptor getDescriptorForMember(
@NotNull JavaDescriptorResolver javaDescriptorResolver,
@NotNull PsiMember member,
@NotNull BindingContext bindingContext
) {
PsiClass containingClass = member.getContainingClass();
if (containingClass == null) { // e.g., type parameter
return null;
}
String qualifiedName = containingClass.getQualifiedName();
assert qualifiedName != null : "Trying to get line markers for anonymous or local class " + containingClass.getText();
FqName classFqName = new FqName(qualifiedName);
ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName);
assert klass != null : " Couldn't find class " + classFqName;
return getDescriptorForMember(member, klass.getDefaultType().getMemberScope(), bindingContext);
}
@Nullable
private static DeclarationDescriptor getDescriptorForMember(
@NotNull PsiMember member,
@NotNull JetScope memberScope,
@NotNull BindingContext bindingContext
) {
String memberNameAsString = member.getName();
assert memberNameAsString != null;
Name name = Name.identifier(memberNameAsString);
if (member instanceof PsiMethod) {
memberScope.getFunctions(name);
}
else if (member instanceof PsiField) {
memberScope.getProperties(name);
}
else {
return null;
}
PsiModifierListOwner annotationOwner = getAnnotationOwner(member);
DeclarationDescriptor memberDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotationOwner);
assert memberDescriptor != null : "Couldn't find descriptor for " + annotationOwner;
return memberDescriptor;
}
public static boolean isMarkersEnabled(@NotNull Project project) {
return PropertiesComponent.getInstance(project).getBoolean(SHOW_MARKERS_PROPERTY, true);
}