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

Refactor mysterious field typeParameters to be local variable with a less mysterious name

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-03 21:15:13 +04:00
parent 09c609e765
commit 1d36188589
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java
+1 -3
View File
@@ -147,14 +147,11 @@ class JavaDescriptorResolveData {
private final ClassDescriptorFromJvmBytecode classDescriptor;
List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameters;
protected ResolverClassData(boolean negative) {
super(negative);
this.classDescriptor = null;
}
protected ResolverClassData(
@Nullable PsiClass psiClass,
@Nullable PsiPackage psiPackage,
@@ -166,6 +163,7 @@ class JavaDescriptorResolveData {
classDescriptor = descriptor;
}
public ClassDescriptorFromJvmBytecode getClassDescriptor() {
return classDescriptor;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+4 -3
View File
@@ -239,10 +239,11 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
List<JetType> supertypes = new ArrayList<JetType>();
classData.typeParameters = javaDescriptorSignatureResolver.createUninitializedClassTypeParameters(psiClass, classData);
List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
= javaDescriptorSignatureResolver.createUninitializedClassTypeParameters(psiClass, classData);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>();
for (JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization typeParameter : classData.typeParameters) {
for (JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization typeParameter : typeParameterDescriptorInitializations) {
typeParameters.add(typeParameter.descriptor);
}
@@ -262,7 +263,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
classData.getClassDescriptor().createTypeConstructor();
classData.getClassDescriptor().setScopeForMemberLookup(new JavaClassMembersScope(semanticServices, classData));
javaDescriptorSignatureResolver.initializeTypeParameters(classData.typeParameters, classData.getClassDescriptor(), "class " + qualifiedName);
javaDescriptorSignatureResolver.initializeTypeParameters(typeParameterDescriptorInitializations, classData.getClassDescriptor(), "class " + qualifiedName);
// TODO: ugly hack: tests crash if initializeTypeParameters called with class containing proper supertypes
supertypes.addAll(getSupertypes(new PsiClassWrapper(psiClass), classData, classData.getTypeParameters()));