Merge pull request #8666 from lahodaj/create-local-variable-in-lambda-in-field

Fixing create local variable fix for lambdas inside field initializers.

Author: lahodaj

java/java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java

@@ -170,6 +170,7 @@ private static List<Fix> analyzeImpl(CompilationInfo info, String diagnosticKey,
         TreePath parent = null;
         TreePath firstClass = null;
         TreePath firstMethod = null;
+        TreePath firstLambda = null;
         TreePath firstVar = null;
         TreePath firstInitializer = null;
         TreePath methodInvocation = null;
@@ -194,6 +195,9 @@ private static List<Fix> analyzeImpl(CompilationInfo info, String diagnosticKey,
                 firstClass = path;
             if (leafKind == Kind.METHOD && firstMethod == null && firstClass == null)
                 firstMethod = path;
+            if (leafKind == Kind.LAMBDA_EXPRESSION && firstMethod == null &&
+                firstClass == null && firstLambda == null && firstInitializer == null)
+                firstLambda = path;
             //static/dynamic initializer:
             if (   leafKind == Kind.BLOCK && TreeUtilities.CLASS_TREE_KINDS.contains(path.getParentPath().getLeaf().getKind())
                 && firstMethod == null && firstClass == null)
@@ -495,7 +499,7 @@ private static List<Fix> analyzeImpl(CompilationInfo info, String diagnosticKey,
             int identifierPos = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), errorPath.getLeaf());
             if (ee != null && fixTypes.contains(ElementKind.PARAMETER) && !Utilities.isMethodHeaderInsideGuardedBlock(info, (MethodTree) firstMethod.getLeaf()))
                 result.add(new AddParameterOrLocalFix(info, type, simpleName, ElementKind.PARAMETER, identifierPos).toEditorFix());
-            if ((firstMethod != null || firstInitializer != null) && fixTypes.contains(ElementKind.LOCAL_VARIABLE) && ErrorFixesFakeHint.enabled(ErrorFixesFakeHint.FixKind.CREATE_LOCAL_VARIABLE))
+            if ((firstMethod != null || firstInitializer != null || firstLambda != null) && fixTypes.contains(ElementKind.LOCAL_VARIABLE) && ErrorFixesFakeHint.enabled(ErrorFixesFakeHint.FixKind.CREATE_LOCAL_VARIABLE))
                 result.add(new AddParameterOrLocalFix(info, type, simpleName, ElementKind.LOCAL_VARIABLE, identifierPos).toEditorFix());
             if (fixTypes.contains(ElementKind.RESOURCE_VARIABLE))
                 result.add(new AddParameterOrLocalFix(info, type, simpleName, ElementKind.RESOURCE_VARIABLE, identifierPos).toEditorFix());

java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java

@@ -468,6 +468,27 @@ public void testTWR2() throws Exception {
                 "AddParameterOrLocalFix:in:java.io.FileInputStream:RESOURCE_VARIABLE");
     }
 
+    public void testLocalInLambdaInField() throws Exception {
+        performFixTest("test/Test.java",
+                """
+                package test;
+                public class Test {
+                    Runnable r = () -> {
+                        i|i = 0;
+                    };
+                }
+                """,
+                "AddParameterOrLocalFix:ii:int:LOCAL_VARIABLE",
+                """
+                package test;
+                public class Test {
+                    Runnable r = () -> {
+                        int ii = 0;
+                    };
+                }
+                """.replaceAll("[ \t\n]+", " "));
+    }
+
     @Override
     protected List<Fix> computeFixes(CompilationInfo info, String diagnosticCode, int pos, TreePath path) throws Exception {
         List<Fix> fixes = super.computeFixes(info, diagnosticCode, pos, path);