"extract lambda to method" should create valid code with appropriate …

…method params
Honza-cz · Oct 5, 2023 · db8b8b3 · db8b8b3
1 parent ceec539
commit db8b8b3
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/introduce/ScanStatement.java b/java/java.hints/src/org/netbeans/modules/java/hints/introduce/ScanStatement.java
@@ -42,6 +42,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import org.netbeans.api.java.source.CompilationInfo;
@@ -76,6 +77,7 @@ final class ScanStatement extends ErrorAwareTreePathScanner<Void, Void> {
     private boolean secondPass = false;
     private boolean stopSecondPass = false;
     private final AtomicBoolean cancel;
+    private boolean isLambda = false;
 
     /**
      * Nesting level for local classes and lambdas. Ignore returns in nested scopes
@@ -114,12 +116,18 @@ public Void scan(Tree tree, Void p) {
         }
         return null;
     }
-
+    
     @Override
     public Void visitLambdaExpression(LambdaExpressionTree node, Void p) {
         nesting++;
+        if (node.equals(firstInSelection)) {
+            phase = PHASE_INSIDE_SELECTION;
+        }
+        isLambda = true;
+
         super.visitLambdaExpression(node, p);
         nesting--;
+        isLambda = false;
         return null;
     }
 
@@ -161,7 +169,12 @@ public Void visitVariable(VariableTree node, Void p) {
     public Void visitIdentifier(IdentifierTree node, Void p) {
         Element e = info.getTrees().getElement(getCurrentPath());
         if (e != null) {
-            if (IntroduceHint.LOCAL_VARIABLES.contains(e.getKind())) {
+
+            if (isLambda && treesSeensInSelection.contains(node) && e.getKind().equals(ElementKind.LOCAL_VARIABLE)){
+                usedLocalVariables.put((VariableElement) e, !localVariables.contains(e));
+            }
+
+            if (IntroduceHint.LOCAL_VARIABLES.contains(e.getKind()) && (e.getKind()!=ElementKind.PARAMETER) || isLambda) {
                 switch (phase) {
                     case PHASE_INSIDE_SELECTION:
                         if (localVariables.contains(e) && usedLocalVariables.get(e) == null) {
@@ -356,4 +369,4 @@ String verifyExits(boolean exitsFromAllBranches) {
         return null;
     }
 
-}
+}