constant expressions check: discard polyadic expressions of non-primitive/Strings types (IDEA-104347)

java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java

@@ -87,6 +87,11 @@ public class IsConstantExpressionVisitor extends JavaElementVisitor {
     for (PsiExpression operand : expression.getOperands()) {
       operand.accept(this);
       if (!myIsConstant) return;
+      final PsiType type = operand.getType();
+      if (type != null && !(type instanceof PsiPrimitiveType) && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
+        myIsConstant = false;
+        return;
+      }
     }
   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/AnnotationArgs.java

@@ -0,0 +1,22 @@
+@interface Foo {
+  String value(); 
+}
+
+@Foo(<error descr="Attribute value must be constant">"myclass: " + Bar.class</error>)
+class Bar {}
+
+@Foo("myclass: Bazz")
+class Bazz{}
+
+@Foo("myclass:" + "Bazz1")
+class Bazz1{}
+
+@Foo(Const.CONST + Const.CONST)
+class Bazz2{}
+
+@Foo(<error descr="Incompatible types. Found: 'java.lang.Class<FooBar>', required: 'java.lang.String'">FooBar.class</error>)
+class FooBar {}
+
+class Const {
+  public static final String CONST = "const";
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java

@@ -172,4 +172,5 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testAmbiguousMethodCallIDEA100314() { doTest(false, false); }
   public void testInstanceMemberNotAccessibleInStaticContext() { doTest(false, false); }
   public void testRejectedTypeParamsForConstructor() { doTest(false, false); }
+  public void testAnnotationArgs() throws Exception { doTest(false, false);}
 }