qualify conflicting fields name (IDEA-123969)

java/java-tests/testData/refactoring/introduceField/afterConflictingFieldInContainingClass.java

@@ -0,0 +1,12 @@
+class A {
+  private final int aField = 1;
+
+  class B {
+
+      public final int aField = 2;
+
+      int method() {
+      return A.this.aField + aField;
+    }
+  }
+}

java/java-tests/testData/refactoring/introduceField/afterConflictingFieldInContainingClassLocal.java

@@ -0,0 +1,12 @@
+class A {
+  private final int aField = 1;
+
+  class B {
+
+      public final int aField = 2;
+
+      int method() {
+          return A.this.aField + aField;
+    }
+  }
+}

java/java-tests/testData/refactoring/introduceField/beforeConflictingFieldInContainingClass.java

@@ -0,0 +1,10 @@
+class A {
+  private final int aField = 1;
+
+  class B {
+
+    int method() {
+      return aField + <selection>2</selection>;
+    }
+  }
+}

java/java-tests/testData/refactoring/introduceField/beforeConflictingFieldInContainingClassLocal.java

@@ -0,0 +1,11 @@
+class A {
+  private final int aField = 1;
+
+  class B {
+
+    int method() {
+      int <selection>i</selection> = 2;
+      return aField + i;
+    }
+  }
+}