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

Drop JVMConfigurationKeys.ANNOTATIONS_PATH_KEY and external annotations in CLI

Browse Source 
CoreExternalAnnotationsManager is moved to the only usage left, which is in the
test
This commit is contained in:
Alexander Udalov
2015-04-25 00:31:28 +03:00
committed by Dmitry Jemerov
parent b0a4e812e5
commit c41aefe2cb
9 changed files with 15 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java
+4 -8
View File
@@ -40,15 +40,12 @@ import java.util.List;
public class TraceBasedExternalSignatureResolver implements ExternalSignatureResolver {
@NotNull private final BindingTrace trace;
@NotNull private final ExternalAnnotationResolver externalAnnotationResolver;
@NotNull private final Project project;
public TraceBasedExternalSignatureResolver(
@NotNull ExternalAnnotationResolver externalAnnotationResolver,
@NotNull Project project,
@NotNull BindingTrace trace
) {
this.externalAnnotationResolver = externalAnnotationResolver;
this.project = project;
this.trace = trace;
}
@@ -84,9 +81,9 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes
assert methodOrConstructor instanceof JavaMethod || methodOrConstructor instanceof JavaConstructor :
"Not a method or a constructor: " + methodOrConstructor.getName();
AlternativeMethodSignatureData data =
new AlternativeMethodSignatureData(externalAnnotationResolver, methodOrConstructor, receiverType, project, valueParameters,
returnType, typeParameters, hasSuperMethods);
AlternativeMethodSignatureData data = new AlternativeMethodSignatureData(
methodOrConstructor, receiverType, project, valueParameters, returnType, typeParameters, hasSuperMethods
);
if (data.isAnnotated() && !data.hasErrors()) {
if (JvmPackage.getPLATFORM_TYPES()) {
@@ -110,8 +107,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes
@NotNull JetType returnType,
boolean isVar
) {
AlternativeFieldSignatureData data =
new AlternativeFieldSignatureData(externalAnnotationResolver, field, returnType, project, isVar);
AlternativeFieldSignatureData data = new AlternativeFieldSignatureData(field, returnType, project, isVar);
if (data.isAnnotated() && !data.hasErrors()) {
if (JvmPackage.getPLATFORM_TYPES()) {
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java
+1 -3
View File
@@ -21,7 +21,6 @@ import com.intellij.util.containers.ComparatorUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl;
import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver;
import org.jetbrains.kotlin.load.java.structure.JavaField;
import org.jetbrains.kotlin.psi.JetProperty;
import org.jetbrains.kotlin.types.JetType;
@@ -34,13 +33,12 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
private JetType altReturnType;
public AlternativeFieldSignatureData(
@NotNull ExternalAnnotationResolver externalAnnotationResolver,
@NotNull JavaField field,
@NotNull JetType originalReturnType,
@NotNull Project project,
boolean isVar
) {
String signature = SignaturesUtil.getKotlinSignature(externalAnnotationResolver, field);
String signature = SignaturesUtil.getKotlinSignature(field);
if (signature == null) {
setAnnotated(false);
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java
+1 -3
View File
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl;
import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl;
import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver;
import org.jetbrains.kotlin.load.java.structure.JavaMember;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
@@ -63,7 +62,6 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD
private Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> originalToAltTypeParameters;
public AlternativeMethodSignatureData(
@NotNull ExternalAnnotationResolver externalAnnotationResolver,
@NotNull JavaMember methodOrConstructor,
@Nullable JetType receiverType,
@NotNull Project project,
@@ -72,7 +70,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD
@NotNull List<TypeParameterDescriptor> methodTypeParameters,
boolean hasSuperMethods
) {
String signature = SignaturesUtil.getKotlinSignature(externalAnnotationResolver, methodOrConstructor);
String signature = SignaturesUtil.getKotlinSignature(methodOrConstructor);
if (signature == null) {
setAnnotated(false);
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesUtil.java
+7 -17
View File
@@ -19,9 +19,10 @@ package org.jetbrains.kotlin.resolve.jvm.kotlinSignature;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver;
import org.jetbrains.kotlin.load.java.structure.*;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.load.java.structure.JavaAnnotation;
import org.jetbrains.kotlin.load.java.structure.JavaAnnotationArgument;
import org.jetbrains.kotlin.load.java.structure.JavaLiteralAnnotationArgument;
import org.jetbrains.kotlin.load.java.structure.JavaMember;
import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.*;
@@ -30,11 +31,11 @@ public class SignaturesUtil {
}
@Nullable
public static String getKotlinSignature(@NotNull ExternalAnnotationResolver externalAnnotationResolver, @NotNull JavaMember member) {
JavaAnnotation newAnnotation = findAnnotationWithExternal(externalAnnotationResolver, member, KOTLIN_SIGNATURE);
public static String getKotlinSignature(@NotNull JavaMember member) {
JavaAnnotation newAnnotation = member.findAnnotation(KOTLIN_SIGNATURE);
if (newAnnotation != null) return extractKotlinSignatureArgument(newAnnotation);
JavaAnnotation oldAnnotation = findAnnotationWithExternal(externalAnnotationResolver, member, OLD_KOTLIN_SIGNATURE);
JavaAnnotation oldAnnotation = member.findAnnotation(OLD_KOTLIN_SIGNATURE);
if (oldAnnotation != null) return extractKotlinSignatureArgument(oldAnnotation);
return null;
@@ -51,15 +52,4 @@ public class SignaturesUtil {
}
return null;
}
@Nullable
public static JavaAnnotation findAnnotationWithExternal(@NotNull ExternalAnnotationResolver externalAnnotationResolver, @NotNull JavaAnnotationOwner owner, @NotNull FqName name) {
JavaAnnotation annotation = owner.findAnnotation(name);
if (annotation != null) {
return annotation;
}
return externalAnnotationResolver.findExternalAnnotation(owner, name);
}
}