[java-refactoring] Inline delegating variable: an ability to keep the current variable name

Fixes IDEA-371649 Inline variable using the later name

GitOrigin-RevId: a31d332762af3721245af31841562ff48a0cb3a9

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterArrayInitializer.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 package com.siyeh.igfixes.inline;
 
 class ArrayInitializer {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterCastNeeded.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 package com.siyeh.igfixes.inline;
 
 class CastNeeded {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterComment.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class Comment {
   
   Object x(String s) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterInlineInsideSwitchExpression.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 import java.util.List;
 
 public class Demo {
@@ -5,7 +6,7 @@ public class Demo {
   public static void main(String[] args) {
     var y = switch (1) {
       case 1:
-          yield <caret>3;
+        <caret>  yield 3;
       default:
         yield 4;
     };

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterNewLineInInitializer.java

@@ -1,8 +1,9 @@
+// "Inline variable" "true-preview"
 import java.util.List;
 
 public class Demo {
   List<String> test(List<String> list) {
-      return <caret>list.stream()
+    <caret>  return list.stream()
         .map(String::toUpperCase)
         .map(String::trim)
         .toList();

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterResourceVar.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterResourceVarInMiddle.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null; AutoCloseable r3 = null) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterSingleResourceVar.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterTwoVarsNormal.java

@@ -0,0 +1,19 @@
+// "Inline variable|->Keep the 'vExposure' variable" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification vExposure : vExposures) {
+        // ... lines of code using exp ...
+      System.out.println(vExposure);
+    }
+  }
+}

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterTwoVarsRename.java

@@ -0,0 +1,19 @@
+// "Inline variable|->Inline and rename 'vExposure' to 'exp'" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification exp : vExposures) {
+        // ... lines of code using exp ...
+      System.out.println(exp);
+    }
+  }
+}

java/java-tests/testData/ig/com/siyeh/igfixes/inline/afterTwoVarsRenameUsed.java

@@ -0,0 +1,20 @@
+// "Inline variable|->Inline and rename 'vExposure' to 'exp'" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification exp : vExposures) {
+      System.out.println(exp);
+        // ... lines of code using exp ...
+      System.out.println(exp);
+    }
+  }
+}

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeArrayInitializer.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 package com.siyeh.igfixes.inline;
 
 class ArrayInitializer {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeCastForOverloads.java

@@ -1,3 +1,4 @@
+// "Inline variable" "false"
 class Base {
   {
     Descendant descendant = new Descendant();

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeCastNeeded.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 package com.siyeh.igfixes.inline;
 
 class CastNeeded {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeComment.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class Comment {
   
   Object x(String s) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeInlineInsideSwitchExpression.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 import java.util.List;
 
 public class Demo {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeNewLineInInitializer.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 import java.util.List;
 
 public class Demo {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeResourceVar.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null; AutoCloseable <caret>r2 = r1) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeResourceVarInMiddle.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null; AutoCloseable <caret>r2 = r1; AutoCloseable r3 = null) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeSingleResourceVar.java

@@ -1,3 +1,4 @@
+// "Inline variable" "true-preview"
 class C {
     void m() throws Exception {
         try (AutoCloseable r1 = null) {

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeTwoVarsNormal.java

@@ -0,0 +1,20 @@
+// "Inline variable|->Keep the 'vExposure' variable" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification vExposure : vExposures) {
+      ExposureSpecification e<caret>xp = vExposure;
+      // ... lines of code using exp ...
+      System.out.println(exp);
+    }
+  }
+}

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeTwoVarsRename.java

@@ -0,0 +1,20 @@
+// "Inline variable|->Inline and rename 'vExposure' to 'exp'" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification vExposure : vExposures) {
+      ExposureSpecification e<caret>xp = vExposure;
+      // ... lines of code using exp ...
+      System.out.println(exp);
+    }
+  }
+}

java/java-tests/testData/ig/com/siyeh/igfixes/inline/beforeTwoVarsRenameUsed.java

@@ -0,0 +1,21 @@
+// "Inline variable|->Inline and rename 'vExposure' to 'exp'" "true-preview"
+package com.example;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Demo {
+  static class ExposureSpecification {
+  }
+
+  public static void main(String[] args) {
+    List<ExposureSpecification> vExposures = new ArrayList<>();
+
+    for (ExposureSpecification vExposure : vExposures) {
+      System.out.println(vExposure);
+      ExposureSpecification e<caret>xp = vExposure;
+      // ... lines of code using exp ...
+      System.out.println(exp);
+    }
+  }
+}