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

Rename class: Origin -> DeclarationOrigin

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-07 15:37:53 +04:00
parent a657a19253
commit e9bf09d240
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java
+8 -8
View File
@@ -5,8 +5,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements ClassPsiDeclarationProvider { public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements ClassPsiDeclarationProvider {
@@ -14,20 +14,20 @@ public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase
private final PsiClass psiClass; private final PsiClass psiClass;
private final boolean staticMembers; private final boolean staticMembers;
@NotNull @NotNull
protected final Origin origin; protected final DeclarationOrigin declarationOrigin;
protected ClassPsiDeclarationProviderImpl( protected ClassPsiDeclarationProviderImpl(
@NotNull PsiClass psiClass, boolean staticMembers @NotNull PsiClass psiClass, boolean staticMembers
) { ) {
this.staticMembers = staticMembers; this.staticMembers = staticMembers;
this.psiClass = psiClass; this.psiClass = psiClass;
this.origin = determineOrigin(psiClass); this.declarationOrigin = determineOrigin(psiClass);
} }
@Override @Override
@NotNull @NotNull
protected MembersCache buildMembersCache() { protected MembersCache buildMembersCache() {
return MembersCache.buildMembersByNameCache(new MembersCache(), psiClass, null, staticMembers, getOrigin() == KOTLIN); return MembersCache.buildMembersByNameCache(new MembersCache(), psiClass, null, staticMembers, getDeclarationOrigin() == KOTLIN);
} }
@Override @Override
@@ -38,12 +38,12 @@ public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase
@Override @Override
@NotNull @NotNull
public Origin getOrigin() { public DeclarationOrigin getDeclarationOrigin() {
return origin; return declarationOrigin;
} }
@NotNull @NotNull
private static Origin determineOrigin(@Nullable PsiClass psiClass) { private static DeclarationOrigin determineOrigin(@Nullable PsiClass psiClass) {
return ((psiClass != null) && DescriptorResolverUtils.isKotlinClass(psiClass)) ? KOTLIN : JAVA; return ((psiClass != null) && DescriptorResolverUtils.isKotlinClass(psiClass)) ? KOTLIN : JAVA;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/DeclarationOrigin.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.lang.resolve.java.provider; package org.jetbrains.jet.lang.resolve.java.provider;
public enum Origin { public enum DeclarationOrigin {
JAVA, JAVA,
KOTLIN KOTLIN
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java
+3 -3
View File
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider { public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider {
@@ -45,13 +45,13 @@ public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclara
@Override @Override
protected MembersCache buildMembersCache() { protected MembersCache buildMembersCache() {
MembersCache cacheWithMembers = super.buildMembersCache(); MembersCache cacheWithMembers = super.buildMembersCache();
MembersCache.buildMembersByNameCache(cacheWithMembers, null, packagePsiDeclarationProvider.getPsiPackage(), true, getOrigin() == KOTLIN); MembersCache.buildMembersByNameCache(cacheWithMembers, null, packagePsiDeclarationProvider.getPsiPackage(), true, getDeclarationOrigin() == KOTLIN);
return cacheWithMembers; return cacheWithMembers;
} }
@NotNull @NotNull
@Override @Override
public Origin getOrigin() { public DeclarationOrigin getDeclarationOrigin() {
return KOTLIN; return KOTLIN;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java
+4 -4
View File
@@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.java.provider;
import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider { public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider {
@@ -42,12 +42,12 @@ public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProvi
@NotNull @NotNull
@Override @Override
protected MembersCache buildMembersCache() { protected MembersCache buildMembersCache() {
return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getOrigin() == KOTLIN); return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getDeclarationOrigin() == KOTLIN);
} }
@NotNull @NotNull
@Override @Override
public Origin getOrigin() { public DeclarationOrigin getDeclarationOrigin() {
return JAVA; return JAVA;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java
+1 -1
View File
@@ -24,5 +24,5 @@ public interface PsiDeclarationProvider {
MembersCache getMembersCache(); MembersCache getMembersCache();
@NotNull @NotNull
Origin getOrigin(); DeclarationOrigin getDeclarationOrigin();
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+4 -4
View File
@@ -44,8 +44,8 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public final class JavaFunctionResolver { public final class JavaFunctionResolver {
@@ -100,7 +100,7 @@ public final class JavaFunctionResolver {
final PsiMethod psiMethod = method.getPsiMethod(); final PsiMethod psiMethod = method.getPsiMethod();
final PsiClass containingClass = psiMethod.getContainingClass(); final PsiClass containingClass = psiMethod.getContainingClass();
if (scopeData.getOrigin() == KOTLIN) { if (scopeData.getDeclarationOrigin() == KOTLIN) {
// TODO: unless maybe class explicitly extends Object // TODO: unless maybe class explicitly extends Object
assert containingClass != null; assert containingClass != null;
String ownerClassName = containingClass.getQualifiedName(); String ownerClassName = containingClass.getQualifiedName();
@@ -163,7 +163,7 @@ public final class JavaFunctionResolver {
BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, psiMethod, functionDescriptorImpl); BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, psiMethod, functionDescriptorImpl);
} }
if (scopeData.getOrigin() == JAVA) { if (scopeData.getDeclarationOrigin() == JAVA) {
trace.record(BindingContext.IS_DECLARED_IN_JAVA, functionDescriptorImpl); trace.record(BindingContext.IS_DECLARED_IN_JAVA, functionDescriptorImpl);
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+3 -3
View File
@@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.types.TypeUtils;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.*; import java.util.*;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA;
public final class JavaPropertyResolver { public final class JavaPropertyResolver {
@@ -245,7 +245,7 @@ public final class JavaPropertyResolver {
recordObjectDeclarationClassIfNeeded(psiData, realOwner, propertyDescriptor, propertyType); recordObjectDeclarationClassIfNeeded(psiData, realOwner, propertyDescriptor, propertyType);
if (scopeData.getOrigin() == JAVA) { if (scopeData.getDeclarationOrigin() == JAVA) {
trace.record(BindingContext.IS_DECLARED_IN_JAVA, propertyDescriptor); trace.record(BindingContext.IS_DECLARED_IN_JAVA, propertyDescriptor);
} }
return propertyDescriptor; return propertyDescriptor;
@@ -423,7 +423,7 @@ public final class JavaPropertyResolver {
} }
private static boolean isPropertyFinal(PsiDeclarationProvider scopeData, PropertyPsiData psiData) { private static boolean isPropertyFinal(PsiDeclarationProvider scopeData, PropertyPsiData psiData) {
if (scopeData.getOrigin() == JAVA) { if (scopeData.getDeclarationOrigin() == JAVA) {
return true; return true;
} }
return psiData.isFinal(); return psiData.isFinal();
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java
+2 -2
View File
@@ -43,7 +43,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public final class JavaSupertypeResolver { public final class JavaSupertypeResolver {
@@ -144,7 +144,7 @@ public final class JavaSupertypeResolver {
@NotNull ClassDescriptor classDescriptor, @NotNull ClassDescriptor classDescriptor,
@NotNull List<JetType> result @NotNull List<JetType> result
) { ) {
if (classData.getOrigin() == KOTLIN if (classData.getDeclarationOrigin() == KOTLIN
|| DescriptorResolverUtils.OBJECT_FQ_NAME.equalsTo(psiClass.getQualifiedName()) || DescriptorResolverUtils.OBJECT_FQ_NAME.equalsTo(psiClass.getQualifiedName())
// TODO: annotations // TODO: annotations
|| classDescriptor.getKind() == ClassKind.ANNOTATION_CLASS) { || classDescriptor.getKind() == ClassKind.ANNOTATION_CLASS) {