anonymous -> lambda: fix anonymous classes in enum constants

java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java

@@ -161,7 +161,8 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
     final PsiCall call = LambdaUtil.treeWalkUp(topExpr);
     if (call != null && call.resolveMethod() != null) {
       final int offsetInTopCall = aClass.getTextRange().getStartOffset() - call.getTextRange().getStartOffset();
-      final PsiCall copyCall = (PsiCall)call.copy();
+      PsiCall copyCall = LambdaUtil.copyTopLevelCall(call);
+      if (copyCall == null) return null;
       final PsiAnonymousClass classArg = PsiTreeUtil.getParentOfType(copyCall.findElementAt(offsetInTopCall), PsiAnonymousClass.class);
       if (classArg != null) {
         PsiExpression lambda = JavaPsiFacade.getElementFactory(aClass.getProject())

java/java-psi-api/src/com/intellij/psi/LambdaUtil.java

@@ -775,6 +775,28 @@ public class LambdaUtil {
     return top;
   }
 
+  public static PsiCall copyTopLevelCall(@NotNull PsiCall call) {
+    PsiCall copyCall = (PsiCall)call.copy();
+    if (call instanceof PsiEnumConstant) {
+      PsiClass containingClass = ((PsiEnumConstant)call).getContainingClass();
+      if (containingClass == null) {
+        return null;
+      }
+      String enumName = containingClass.getName();
+      if (enumName == null) {
+        return null;
+      }
+      PsiMethod resolveMethod = call.resolveMethod();
+      if (resolveMethod == null) {
+        return null;
+      }
+      PsiClass anEnum = JavaPsiFacade.getElementFactory(call.getProject()).createEnum(enumName);
+      anEnum.add(resolveMethod);
+      return  (PsiCall)anEnum.add(copyCall);
+    }
+    return copyCall;
+  }
+
   public static class TypeParamsChecker extends PsiTypeVisitor<Boolean> {
     private PsiMethod myMethod;
     private final PsiClass myClass;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterAnonymousInsideEnumConstant.java

@@ -0,0 +1,6 @@
+// "Replace with lambda" "true"
+enum E {
+  A(() -> {});
+
+  public E(Runnable r) {}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeAnonymousInsideEnumConstant.java

@@ -0,0 +1,8 @@
+// "Replace with lambda" "true"
+enum E {
+  A(new Runna<caret>ble() {
+    public void run(){}
+  });
+
+  public E(Runnable r) {}
+}