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

KT-12877: don't throw exception when @JsModule annotation is improperly used

Browse Source
This commit is contained in:
Alexey Andreev
2016-11-29 15:04:31 +03:00
committed by Alexey Andreev
parent d40e923722
commit df88ebb1b3
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
+10 -3
View File
@@ -213,7 +213,10 @@ public final class AnnotationsUtils {
DeclarationDescriptor annotationType = annotation.getType().getConstructor().getDeclarationDescriptor();
if (annotationType == null) continue;
FqNameUnsafe fqName = DescriptorUtils.getFqName(annotation.getType().getConstructor().getDeclarationDescriptor());
DeclarationDescriptor annotationTypeDescriptor = annotation.getType().getConstructor().getDeclarationDescriptor();
assert annotationTypeDescriptor != null : "Annotation type should have descriptor: " + annotation.getType();
FqNameUnsafe fqName = DescriptorUtils.getFqName(annotationTypeDescriptor);
if (fqName.equals(JS_NON_MODULE_ANNOTATION.toUnsafe())) {
return true;
}
@@ -222,10 +225,14 @@ public final class AnnotationsUtils {
return false;
}
@NotNull
@Nullable
private static String extractJsModuleName(@NotNull AnnotationDescriptor annotation) {
if (annotation.getAllValueArguments().isEmpty()) return null;
ConstantValue<?> importValue = annotation.getAllValueArguments().values().iterator().next();
assert importValue != null : "JsModule annotation should have at least one argument";
if (importValue == null) return null;
if (!(importValue.getValue() instanceof String)) return null;
return (String) importValue.getValue();
}