From 37fcffc39dafb1e39b30d5362660c271512d0e9f Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 13 Apr 2012 17:44:46 +0400 Subject: [PATCH] remove assertion from JDR.resolveAnnotation #KT-1771 fixed --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 88e41002402..4697ec71d1a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1616,8 +1616,10 @@ public class JavaDescriptorResolver { PsiAnnotationParameterList parameterList = psiAnnotation.getParameterList(); for (PsiNameValuePair psiNameValuePair : parameterList.getAttributes()) { PsiAnnotationMemberValue value = psiNameValuePair.getValue(); - // todo - assert value instanceof PsiLiteralExpression; + if (!(value instanceof PsiLiteralExpression)) { + // todo + continue; + } Object literalValue = ((PsiLiteralExpression) value).getValue(); if(literalValue instanceof String) valueArguments.add(new StringValue((String) literalValue));