From 3fb3c93d3d2ddaaa212a127e855ef80e2a87b981 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <tagir.valeev@jetbrains.com>
Date: Thu, 12 Oct 2023 17:04:23 +0200
Subject: [PATCH] [java-refactoring] Test for EA-882906 fix

GitOrigin-RevId: 085064379eed4ac2c1c0022724ac1fb4f71b5d15
---
 .../inlineMethod/ThisVariableName.java        | 20 +++++++++++++++++++
 .../inlineMethod/ThisVariableName.java.after  | 20 +++++++++++++++++++
 .../refactoring/inline/InlineMethodTest.java  |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java
 create mode 100644 java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java.after

diff --git a/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java b/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java
new file mode 100644
index 000000000000..686fd15dbdb7
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java
@@ -0,0 +1,20 @@
+class Of {
+  private int i = 0;
+
+  public static void main(String[] args) {
+    Of inlineMethods = new Of();
+    inlineMethods.test();
+    inlineMethods.test2();
+  }
+
+  private void test() {
+    this.test2();
+  }
+
+  private void te<caret>st2() {
+    int i1 = this.i;
+    this.i = 2;
+    System.out.println(i1);
+    this.test();
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java.after b/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java.after
new file mode 100644
index 000000000000..a3c2e0aad3ff
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineMethod/ThisVariableName.java.after
@@ -0,0 +1,20 @@
+class Of {
+  private int i = 0;
+
+  public static void main(String[] args) {
+    Of inlineMethods = new Of();
+    inlineMethods.test();
+      int i1 = inlineMethods.i;
+      inlineMethods.i = 2;
+      System.out.println(i1);
+      inlineMethods.test();
+  }
+
+  private void test() {
+      int i1 = this.i;
+      this.i = 2;
+      System.out.println(i1);
+      this.test();
+  }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineMethodTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineMethodTest.java
index df95aab1adc0..336cf973d3cd 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineMethodTest.java
@@ -576,6 +576,8 @@ public class InlineMethodTest extends LightRefactoringTestCase {
   public void testNewWithSideEffect() { doTest(); }
   
   public void testSplitIfAndCollapseBack() { doTest(); }
+  
+  public void testThisVariableName() { doTest(); }
 
   @Override
   protected Sdk getProjectJDK() {