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

Rename methods in PsiMethodWrapper

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-31 20:07:47 +04:00
parent fca3cbb619
commit 93db2f06b3
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java
+3 -3
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.constants.*; import org.jetbrains.jet.lang.resolve.constants.StringValue;
import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData; import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData;
import org.jetbrains.jet.lang.resolve.java.data.ResolverNamespaceData; import org.jetbrains.jet.lang.resolve.java.data.ResolverNamespaceData;
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData; import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
@@ -78,10 +78,10 @@ public final class DescriptorResolverUtils {
public static Modality resolveModality(PsiMemberWrapper memberWrapper, boolean isFinal) { public static Modality resolveModality(PsiMemberWrapper memberWrapper, boolean isFinal) {
if (memberWrapper instanceof PsiMethodWrapper) { if (memberWrapper instanceof PsiMethodWrapper) {
PsiMethodWrapper method = (PsiMethodWrapper) memberWrapper; PsiMethodWrapper method = (PsiMethodWrapper) memberWrapper;
if (method.getJetMethod().hasForceOpenFlag()) { if (method.getJetMethodAnnotation().hasForceOpenFlag()) {
return Modality.OPEN; return Modality.OPEN;
} }
if (method.getJetMethod().hasForceFinalFlag()) { if (method.getJetMethodAnnotation().hasForceFinalFlag()) {
return Modality.FINAL; return Modality.FINAL;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java
+5 -5
View File
@@ -181,7 +181,7 @@ public final class MembersCache {
processSetter(method, propertyParseResult); processSetter(method, propertyParseResult);
} }
if (!method.getJetMethod().hasPropertyFlag()) { if (!method.getJetMethodAnnotation().hasPropertyFlag()) {
NamedMembers namedMembers = getOrCreateEmpty(Name.identifier(method.getName())); NamedMembers namedMembers = getOrCreateEmpty(Name.identifier(method.getName()));
namedMembers.addMethod(method); namedMembers.addMethod(method);
} }
@@ -192,7 +192,7 @@ public final class MembersCache {
String propertyName = propertyParseResult.getPropertyName(); String propertyName = propertyParseResult.getPropertyName();
NamedMembers members = getOrCreateEmpty(Name.identifier(propertyName)); NamedMembers members = getOrCreateEmpty(Name.identifier(propertyName));
if (method.getJetMethod().hasPropertyFlag()) { if (method.getJetMethodAnnotation().hasPropertyFlag()) {
if (method.getParameters().size() == 0) { if (method.getParameters().size() == 0) {
// TODO: report error properly // TODO: report error properly
throw new IllegalStateException(); throw new IllegalStateException();
@@ -217,7 +217,7 @@ public final class MembersCache {
PsiParameterWrapper propertyTypeParameter = method.getParameter(i); PsiParameterWrapper propertyTypeParameter = method.getParameter(i);
TypeSource propertyType = TypeSource propertyType =
new TypeSource(method.getJetMethod().propertyType(), propertyTypeParameter.getPsiParameter().getType(), new TypeSource(method.getJetMethodAnnotation().propertyType(), propertyTypeParameter.getPsiParameter().getType(),
propertyTypeParameter.getPsiParameter()); propertyTypeParameter.getPsiParameter());
members.addPropertyAccessor(new PropertyPsiDataElement(method, false, propertyType, receiverType)); members.addPropertyAccessor(new PropertyPsiDataElement(method, false, propertyType, receiverType));
@@ -229,7 +229,7 @@ public final class MembersCache {
NamedMembers members = getOrCreateEmpty(Name.identifier(propertyName)); NamedMembers members = getOrCreateEmpty(Name.identifier(propertyName));
// TODO: some java properties too // TODO: some java properties too
if (method.getJetMethod().hasPropertyFlag()) { if (method.getJetMethodAnnotation().hasPropertyFlag()) {
int i = 0; int i = 0;
@@ -258,7 +258,7 @@ public final class MembersCache {
// TODO: what if returnType == null? // TODO: what if returnType == null?
final PsiType returnType = method.getReturnType(); final PsiType returnType = method.getReturnType();
assert returnType != null; assert returnType != null;
TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), returnType, method.getPsiMethod()); TypeSource propertyType = new TypeSource(method.getJetMethodAnnotation().propertyType(), returnType, method.getPsiMethod());
members.addPropertyAccessor(new PropertyPsiDataElement(method, true, propertyType, receiverType)); members.addPropertyAccessor(new PropertyPsiDataElement(method, true, propertyType, receiverType));
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
+2 -2
View File
@@ -169,7 +169,7 @@ public final class JavaConstructorResolver {
PsiMethodWrapper constructor = new PsiMethodWrapper(psiConstructor); PsiMethodWrapper constructor = new PsiMethodWrapper(psiConstructor);
//noinspection deprecation //noinspection deprecation
if (constructor.getJetConstructor().hidden()) { if (constructor.getJetConstructorAnnotation().hidden()) {
return null; return null;
} }
@@ -204,7 +204,7 @@ public final class JavaConstructorResolver {
constructorDescriptor.initialize(classData.getClassDescriptor().getTypeConstructor().getParameters(), constructorDescriptor.initialize(classData.getClassDescriptor().getTypeConstructor().getParameters(),
valueParameterDescriptors.getDescriptors(), valueParameterDescriptors.getDescriptors(),
DescriptorResolverUtils.resolveVisibility(psiConstructor, constructor.getJetConstructor()), DescriptorResolverUtils.resolveVisibility(psiConstructor, constructor.getJetConstructorAnnotation()),
aStatic); aStatic);
trace.record(BindingContext.CONSTRUCTOR, psiConstructor, constructorDescriptor); trace.record(BindingContext.CONSTRUCTOR, psiConstructor, constructorDescriptor);
return constructorDescriptor; return constructorDescriptor;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+4 -4
View File
@@ -89,7 +89,7 @@ public final class JavaFunctionResolver {
} }
// TODO: ugly // TODO: ugly
if (method.getJetMethod().hasPropertyFlag()) { if (method.getJetMethodAnnotation().hasPropertyFlag()) {
return null; return null;
} }
@@ -112,7 +112,7 @@ public final class JavaFunctionResolver {
scopeData.getClassOrNamespaceDescriptor(), scopeData.getClassOrNamespaceDescriptor(),
annotationResolver.resolveAnnotations(psiMethod), annotationResolver.resolveAnnotations(psiMethod),
Name.identifier(method.getName()), Name.identifier(method.getName()),
DescriptorKindUtils.flagsToKind(method.getJetMethod().kind()) DescriptorKindUtils.flagsToKind(method.getJetMethodAnnotation().kind())
); );
String context = "method " + method.getName() + " in class " + psiClass.getQualifiedName(); String context = "method " + method.getName() + " in class " + psiClass.getQualifiedName();
@@ -150,7 +150,7 @@ public final class JavaFunctionResolver {
valueParameterDescriptors.getDescriptors(), valueParameterDescriptors.getDescriptors(),
returnType, returnType,
DescriptorResolverUtils.resolveModality(method, method.isFinal()), DescriptorResolverUtils.resolveModality(method, method.isFinal()),
DescriptorResolverUtils.resolveVisibility(psiMethod, method.getJetMethod()), DescriptorResolverUtils.resolveVisibility(psiMethod, method.getJetMethodAnnotation()),
/*isInline = */ false /*isInline = */ false
); );
@@ -238,7 +238,7 @@ public final class JavaFunctionResolver {
@NotNull TypeVariableResolver typeVariableResolver @NotNull TypeVariableResolver typeVariableResolver
) { ) {
String returnTypeFromAnnotation = method.getJetMethod().returnType(); String returnTypeFromAnnotation = method.getJetMethodAnnotation().returnType();
JetType transformedType; JetType transformedType;
if (returnTypeFromAnnotation.length() > 0) { if (returnTypeFromAnnotation.length() > 0) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+2 -2
View File
@@ -131,7 +131,7 @@ public final class JavaPropertyResolver {
PropertyPsiDataElement getter = members.getGetter(); PropertyPsiDataElement getter = members.getGetter();
if (getter != null) { if (getter != null) {
JetMethodAnnotation jetMethod = ((PsiMethodWrapper) getter.getMember()).getJetMethod(); JetMethodAnnotation jetMethod = ((PsiMethodWrapper) getter.getMember()).getJetMethodAnnotation();
visibility = DescriptorResolverUtils.resolveVisibility(members.getCharacteristicPsi(), jetMethod); visibility = DescriptorResolverUtils.resolveVisibility(members.getCharacteristicPsi(), jetMethod);
kind = DescriptorKindUtils.flagsToKind(jetMethod.kind()); kind = DescriptorKindUtils.flagsToKind(jetMethod.kind());
} }
@@ -184,7 +184,7 @@ public final class JavaPropertyResolver {
setterVisibility = DescriptorResolverUtils.resolveVisibility( setterVisibility = DescriptorResolverUtils.resolveVisibility(
setter.getMember().getPsiMember(), setter.getMember().getPsiMember(),
((PsiMethodWrapper) setter.getMember()) ((PsiMethodWrapper) setter.getMember())
.getJetMethod()); .getJetMethodAnnotation());
} }
setterDescriptor = new PropertySetterDescriptor( setterDescriptor = new PropertySetterDescriptor(
propertyDescriptor, propertyDescriptor,
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java
+2 -2
View File
@@ -346,9 +346,9 @@ public final class JavaSignatureResolver {
List<TypeParameterDescriptorInitialization> typeParametersIntialization; List<TypeParameterDescriptorInitialization> typeParametersIntialization;
final PsiMethod psiMethod = method.getPsiMethod(); final PsiMethod psiMethod = method.getPsiMethod();
if (method.getJetMethod().typeParameters().length() > 0) { if (method.getJetMethodAnnotation().typeParameters().length() > 0) {
typeParametersIntialization = resolveMethodTypeParametersFromJetSignature( typeParametersIntialization = resolveMethodTypeParametersFromJetSignature(
method.getJetMethod().typeParameters(), psiMethod, functionDescriptor); method.getJetMethodAnnotation().typeParameters(), psiMethod, functionDescriptor);
} }
else { else {
typeParametersIntialization = makeUninitializedTypeParameters(functionDescriptor, psiMethod.getTypeParameters()); typeParametersIntialization = makeUninitializedTypeParameters(functionDescriptor, psiMethod.getTypeParameters());
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
+10 -10
View File
@@ -55,22 +55,22 @@ public class PsiMethodWrapper extends PsiMemberWrapper {
return getParameters().get(i); return getParameters().get(i);
} }
private JetMethodAnnotation jetMethod; private JetMethodAnnotation jetMethodAnnotation;
@NotNull @NotNull
public JetMethodAnnotation getJetMethod() { public JetMethodAnnotation getJetMethodAnnotation() {
if (jetMethod == null) { if (jetMethodAnnotation == null) {
jetMethod = JetMethodAnnotation.get(getPsiMethod()); jetMethodAnnotation = JetMethodAnnotation.get(getPsiMethod());
} }
return jetMethod; return jetMethodAnnotation;
} }
private JetConstructorAnnotation jetConstructor; private JetConstructorAnnotation jetConstructorAnnotation;
@NotNull @NotNull
public JetConstructorAnnotation getJetConstructor() { public JetConstructorAnnotation getJetConstructorAnnotation() {
if (jetConstructor == null) { if (jetConstructorAnnotation == null) {
jetConstructor = JetConstructorAnnotation.get(getPsiMethod()); jetConstructorAnnotation = JetConstructorAnnotation.get(getPsiMethod());
} }
return jetConstructor; return jetConstructorAnnotation;
} }
@Override @Override