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

Refactoring: AnnotationTargetChecker --> AnnotationChecker

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-07-29 11:33:33 +03:00
parent c11f1807bc
commit 39b29068cb
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.*; import org.jetbrains.kotlin.descriptors.annotations.*;
import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.resolve.AnnotationTargetChecker; import org.jetbrains.kotlin.resolve.AnnotationChecker;
import org.jetbrains.kotlin.resolve.constants.*; import org.jetbrains.kotlin.resolve.constants.*;
import org.jetbrains.kotlin.resolve.constants.StringValue; import org.jetbrains.kotlin.resolve.constants.StringValue;
import org.jetbrains.kotlin.types.Flexibility; import org.jetbrains.kotlin.types.Flexibility;
@@ -187,7 +187,7 @@ public abstract class AnnotationCodegen {
private void generateTargetAnnotation(@NotNull ClassDescriptor classDescriptor, @NotNull Set<String> annotationDescriptorsAlreadyPresent) { private void generateTargetAnnotation(@NotNull ClassDescriptor classDescriptor, @NotNull Set<String> annotationDescriptorsAlreadyPresent) {
String descriptor = Type.getType(Target.class).getDescriptor(); String descriptor = Type.getType(Target.class).getDescriptor();
if (!annotationDescriptorsAlreadyPresent.add(descriptor)) return; if (!annotationDescriptorsAlreadyPresent.add(descriptor)) return;
Set<KotlinTarget> targets = AnnotationTargetChecker.INSTANCE$.possibleTargetSet(classDescriptor); Set<KotlinTarget> targets = AnnotationChecker.INSTANCE$.possibleTargetSet(classDescriptor);
Set<ElementType> javaTargets; Set<ElementType> javaTargets;
if (targets == null) { if (targets == null) {
javaTargets = getJavaTargetList(classDescriptor); javaTargets = getJavaTargetList(classDescriptor);
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationTargetChecker.kt → compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
import org.jetbrains.kotlin.resolve.constants.BooleanValue import org.jetbrains.kotlin.resolve.constants.BooleanValue
import kotlin.annotation import kotlin.annotation
public object AnnotationTargetChecker { public object AnnotationChecker {
public fun check(annotated: JetAnnotated, trace: BindingTrace, descriptor: ClassDescriptor? = null) { public fun check(annotated: JetAnnotated, trace: BindingTrace, descriptor: ClassDescriptor? = null) {
if (annotated is JetTypeParameter) return // TODO: support type parameter annotations if (annotated is JetTypeParameter) return // TODO: support type parameter annotations
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java
+3 -3
View File
@@ -61,7 +61,7 @@ public class DeclarationsChecker {
public void process(@NotNull BodiesResolveContext bodiesResolveContext) { public void process(@NotNull BodiesResolveContext bodiesResolveContext) {
for (JetFile file : bodiesResolveContext.getFiles()) { for (JetFile file : bodiesResolveContext.getFiles()) {
checkModifiersAndAnnotationsInPackageDirective(file); checkModifiersAndAnnotationsInPackageDirective(file);
AnnotationTargetChecker.INSTANCE$.check(file, trace, null); AnnotationChecker.INSTANCE$.check(file, trace, null);
} }
Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = bodiesResolveContext.getDeclaredClasses(); Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = bodiesResolveContext.getDeclaredClasses();
@@ -141,7 +141,7 @@ public class DeclarationsChecker {
} }
} }
} }
AnnotationTargetChecker.INSTANCE$.check(packageDirective, trace, null); AnnotationChecker.INSTANCE$.check(packageDirective, trace, null);
modifiersChecker.reportIllegalModifiers(modifierList, Arrays.asList(JetTokens.MODIFIER_KEYWORDS_ARRAY)); modifiersChecker.reportIllegalModifiers(modifierList, Arrays.asList(JetTokens.MODIFIER_KEYWORDS_ARRAY));
} }
@@ -303,7 +303,7 @@ public class DeclarationsChecker {
if (typeParameter != null) { if (typeParameter != null) {
DescriptorResolver.checkConflictingUpperBounds(trace, typeParameter, jetTypeParameter); DescriptorResolver.checkConflictingUpperBounds(trace, typeParameter, jetTypeParameter);
} }
AnnotationTargetChecker.INSTANCE$.check(jetTypeParameter, trace, null); AnnotationChecker.INSTANCE$.check(jetTypeParameter, trace, null);
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+2 -2
View File
@@ -290,7 +290,7 @@ public class ModifiersChecker {
} }
checkPlatformNameApplicability(descriptor); checkPlatformNameApplicability(descriptor);
runDeclarationCheckers(modifierListOwner, descriptor); runDeclarationCheckers(modifierListOwner, descriptor);
AnnotationTargetChecker.INSTANCE$.check(modifierListOwner, trace, AnnotationChecker.INSTANCE$.check(modifierListOwner, trace,
descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null); descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null);
} }
@@ -308,7 +308,7 @@ public class ModifiersChecker {
reportIllegalVisibilityModifiers(modifierListOwner); reportIllegalVisibilityModifiers(modifierListOwner);
checkPlatformNameApplicability(descriptor); checkPlatformNameApplicability(descriptor);
runDeclarationCheckers(modifierListOwner, descriptor); runDeclarationCheckers(modifierListOwner, descriptor);
AnnotationTargetChecker.INSTANCE$.check(modifierListOwner, trace, AnnotationChecker.INSTANCE$.check(modifierListOwner, trace,
descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null); descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null);
} }
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils;
import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.AnnotationTargetChecker; import org.jetbrains.kotlin.resolve.AnnotationChecker;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingContextUtils;
import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.resolve.scopes.WritableScope;
@@ -128,7 +128,7 @@ public abstract class ExpressionTypingVisitorDispatcher extends JetVisitor<JetTy
@NotNull @NotNull
public final JetTypeInfo getTypeInfo(@NotNull JetExpression expression, ExpressionTypingContext context) { public final JetTypeInfo getTypeInfo(@NotNull JetExpression expression, ExpressionTypingContext context) {
JetTypeInfo result = getTypeInfo(expression, context, this); JetTypeInfo result = getTypeInfo(expression, context, this);
AnnotationTargetChecker.INSTANCE$.checkExpression(expression, context.trace); AnnotationChecker.INSTANCE$.checkExpression(expression, context.trace);
return result; return result;
} }