test++

java/java-tests/testData/refactoring/renameCollisions/RenameClassInnerToLocal.java

@@ -0,0 +1,29 @@
+package renameCollisions;
+
+class LocalClass {
+	public static final int SN_STATIC_FIELD = 2;
+	public static void snStaticMethod() {
+	}
+}
+
+public class RenameCollisions {
+	class Inner<caret>Class {
+		public static final int SN_STATIC_FIELD = 14;
+		public void snMethod() {
+		}
+	}
+
+	public void instanceContext() {
+		LocalClass localClass = new LocalClass();
+		int var1 = LocalClass.SN_STATIC_FIELD;
+		LocalClass.snStaticMethod();
+
+		InnerClass innerClass = new InnerClass();
+		int var4 = InnerClass.SN_STATIC_FIELD;
+	}
+
+	public static void staticContext() {
+		InnerClass innerClass = new RenameCollisions().new InnerClass();
+		int var3 = InnerClass.SN_STATIC_FIELD;
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassInnerToLocal.java.after

@@ -0,0 +1,29 @@
+package renameCollisions;
+
+class LocalClass {
+	public static final int SN_STATIC_FIELD = 2;
+	public static void snStaticMethod() {
+	}
+}
+
+public class RenameCollisions {
+	class Local<caret>Class {
+		public static final int SN_STATIC_FIELD = 14;
+		public void snMethod() {
+		}
+	}
+
+	public void instanceContext() {
+		renameCollisions.LocalClass localClass = new renameCollisions.LocalClass();
+		int var1 = renameCollisions.LocalClass.SN_STATIC_FIELD;
+		renameCollisions.LocalClass.snStaticMethod();
+
+		renameCollisions.RenameCollisions.LocalClass innerClass = new renameCollisions.RenameCollisions.LocalClass();
+		int var4 = renameCollisions.RenameCollisions.LocalClass.SN_STATIC_FIELD;
+	}
+
+	public static void staticContext() {
+		renameCollisions.RenameCollisions.LocalClass innerClass = new RenameCollisions().new LocalClass();
+		int var3 = renameCollisions.RenameCollisions.LocalClass.SN_STATIC_FIELD;
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToAlien.java

@@ -0,0 +1,35 @@
+package renameCollisions;
+
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+class <caret>LocalClass {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	int myField;
+	public void method() {
+	}
+}
+
+public class RenameCollisions {
+	private String myDeclarationUsage;
+	public String declarationUsage(String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+
+		int var6 = LocalClass.STATIC_FIELD;
+		LocalClass.staticMethod();
+
+		LocalClass localClass = new LocalClass();
+		localClass.myField++;
+		localClass.method();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToAlien.java.after

@@ -0,0 +1,35 @@
+package renameCollisions;
+
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+class <caret>String {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	int myField;
+	public void method() {
+	}
+}
+
+public class RenameCollisions {
+	private java.lang.String myDeclarationUsage;
+	public java.lang.String declarationUsage(java.lang.String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+
+		int var6 = renameCollisions.String.STATIC_FIELD;
+		renameCollisions.String.staticMethod();
+
+		renameCollisions.String localClass = new renameCollisions.String();
+		localClass.myField++;
+		localClass.method();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToAlienNoImports.java

@@ -0,0 +1,20 @@
+class <caret>LocalClass {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	int myField;
+	public void method() {
+	}
+}
+
+public class RenameCollisions {
+	private String myDeclarationUsage;
+	public String declarationUsage(String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public static void staticContext() {
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToAlienNoImports.java.after

@@ -0,0 +1,20 @@
+class <caret>String {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	int myField;
+	public void method() {
+	}
+}
+
+public class RenameCollisions {
+	private java.lang.String myDeclarationUsage;
+	public java.lang.String declarationUsage(java.lang.String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public static void staticContext() {
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToInner.java

@@ -0,0 +1,31 @@
+package renameCollisions;
+
+class <caret>LocalClass {
+	public static final int SN_STATIC_FIELD = 2;
+	public static void snStaticMethod() {
+	}
+}
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static final int SN_STATIC_FIELD = 10;
+		public static void snStaticMethod() {
+		}
+	}
+
+	public void instanceContext() {
+		LocalClass localClass = new LocalClass();
+		int var1 = LocalClass.SN_STATIC_FIELD;
+		LocalClass.snStaticMethod();
+
+		StaticInnerClass staticInnerClass = new StaticInnerClass();
+		int var3 = StaticInnerClass.SN_STATIC_FIELD;
+		StaticInnerClass.snStaticMethod();
+	}
+
+	public static void staticContext() {
+		StaticInnerClass staticInnerClass = new StaticInnerClass();
+		int var2 = StaticInnerClass.SN_STATIC_FIELD;
+		StaticInnerClass.snStaticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassLocalToInner.java.after

@@ -0,0 +1,31 @@
+package renameCollisions;
+
+class StaticInnerClass {
+	public static final int SN_STATIC_FIELD = 2;
+	public static void snStaticMethod() {
+	}
+}
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static final int SN_STATIC_FIELD = 10;
+		public static void snStaticMethod() {
+		}
+	}
+
+	public void instanceContext() {
+		renameCollisions.StaticInnerClass localClass = new renameCollisions.StaticInnerClass();
+		int var1 = renameCollisions.StaticInnerClass.SN_STATIC_FIELD;
+		renameCollisions.StaticInnerClass.snStaticMethod();
+
+		renameCollisions.RenameCollisions.StaticInnerClass staticInnerClass = new renameCollisions.RenameCollisions.StaticInnerClass();
+		int var3 = renameCollisions.RenameCollisions.StaticInnerClass.SN_STATIC_FIELD;
+		renameCollisions.RenameCollisions.StaticInnerClass.snStaticMethod();
+	}
+
+	public static void staticContext() {
+		renameCollisions.RenameCollisions.StaticInnerClass staticInnerClass = new renameCollisions.RenameCollisions.StaticInnerClass();
+		int var2 = renameCollisions.RenameCollisions.StaticInnerClass.SN_STATIC_FIELD;
+		renameCollisions.RenameCollisions.StaticInnerClass.snStaticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassThisFqnToAlien.java

@@ -0,0 +1,36 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+public class RenameCollisions<caret> {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	private int myField;
+	public void method() {
+	}
+
+	public void instanceContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+
+		int var6 = RenameCollisions.STATIC_FIELD;
+		RenameCollisions.staticMethod();
+
+		this.myField++;
+		this.method();
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+
+		int var6 = RenameCollisions.STATIC_FIELD;
+		RenameCollisions.staticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassThisFqnToAlien.java.after

@@ -0,0 +1,36 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+public class String<caret> {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	private int myField;
+	public void method() {
+	}
+
+	public void instanceContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+
+		int var6 = String.STATIC_FIELD;
+		String.staticMethod();
+
+		this.myField++;
+		this.method();
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+
+		int var6 = String.STATIC_FIELD;
+		String.staticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassThisToAlien.java

@@ -0,0 +1,41 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+public class RenameCollisions<caret> {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	private int myField;
+	public void method() {
+	}
+
+	private String myDeclarationUsage;
+	public String declarationUsage(String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public void instanceContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+
+		int var6 = STATIC_FIELD;
+		staticMethod();
+
+		myField++;
+		method();
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		String.CASE_INSENSITIVE_ORDER.getClass();
+		String.valueOf(0);
+
+		int var6 = STATIC_FIELD;
+		staticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameClassThisToAlien.java.after

@@ -0,0 +1,41 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.valueOf;
+
+public class String<caret> {
+	public static final int STATIC_FIELD = 5;
+	public static void staticMethod() {
+	}
+	private int myField;
+	public void method() {
+	}
+
+	private java.lang.String myDeclarationUsage;
+	public java.lang.String declarationUsage(java.lang.String s) {
+		return s + myDeclarationUsage;
+	}
+
+	public void instanceContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+
+		int var6 = STATIC_FIELD;
+		staticMethod();
+
+		myField++;
+		method();
+	}
+
+	public static void staticContext() {
+		CASE_INSENSITIVE_ORDER.getClass();
+		valueOf(0);
+
+		java.lang.String.CASE_INSENSITIVE_ORDER.getClass();
+		java.lang.String.valueOf(0);
+
+		int var6 = STATIC_FIELD;
+		staticMethod();
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodIndiInstancesInnerToOuter.java

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public void method() {
+    }
+
+    public static class StaticInnerClass {
+        public void <caret>siMethod() {
+        }
+        public void instanceContext() {
+            siMethod();
+        }
+    }
+
+    public void instanceContext() {
+        method();
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodIndiInstancesInnerToOuter.java.after

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public void method() {
+    }
+
+    public static class StaticInnerClass {
+        public void <caret>method() {
+        }
+        public void instanceContext() {
+            method();
+        }
+    }
+
+    public void instanceContext() {
+        method();
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodIndiInstancesOuterToInner.java

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public void <caret>method() {
+    }
+
+    public static class StaticInnerClass {
+        public void siMethod() {
+        }
+        public void instanceContext() {
+            siMethod();
+        }
+    }
+
+    public void instanceContext() {
+        method();
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodIndiInstancesOuterToInner.java.after

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public void <caret>siMethod() {
+    }
+
+    public static class StaticInnerClass {
+        public void siMethod() {
+        }
+        public void instanceContext() {
+            siMethod();
+        }
+    }
+
+    public void instanceContext() {
+        siMethod();
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodInnerInstanceToOuterInstance.java

@@ -0,0 +1,12 @@
+public class RenameCollisions {
+    public void method() {
+    }
+    class InnerClass {
+        public void <caret>innerMethod() {
+        }
+        public void instanceContext() {
+            method();
+            innerMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodInnerInstanceToOuterInstance.java.after

@@ -0,0 +1,12 @@
+public class RenameCollisions {
+    public void method() {
+    }
+    class InnerClass {
+        public void <caret>method() {
+        }
+        public void instanceContext() {
+            RenameCollisions.this.method();
+            method();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodInnerStaticToOuterStatic.java

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public static void staticMethod() {
+    }
+    public static class StaticInnerClass {
+        public static void siStaticMethod<caret>() {
+        }
+        public void instanceContext() {
+            staticMethod();
+            siStaticMethod();
+        }
+        public static void staticContext() {
+            staticMethod();
+            siStaticMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodInnerStaticToOuterStatic.java.after

@@ -0,0 +1,16 @@
+public class RenameCollisions {
+    public static void staticMethod() {
+    }
+    public static class StaticInnerClass {
+        public static void staticMethod<caret>() {
+        }
+        public void instanceContext() {
+            RenameCollisions.staticMethod();
+            staticMethod();
+        }
+        public static void staticContext() {
+            RenameCollisions.staticMethod();
+            staticMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodOuterInstanceToInnerInstance.java

@@ -0,0 +1,12 @@
+public class RenameCollisions {
+    public void <caret>method() {
+    }
+    class InnerClass {
+        public void innerMethod() {
+        }
+        public void instanceContext() {
+            method();
+            innerMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodOuterInstanceToInnerInstance.java.after

@@ -0,0 +1,13 @@
+public class RenameCollisions {
+    public void <caret>innerMethod() {
+    }
+
+    class InnerClass {
+        public void innerMethod() {
+        }
+        public void instanceContext() {
+            RenameCollisions.this.innerMethod();
+            innerMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodOuterStaticToInnerStatic.java

@@ -0,0 +1,17 @@
+public class RenameCollisions {
+    public static void staticMethod<caret>() {
+    }
+
+    public static class StaticInnerClass {
+        public static void siStaticMethod() {
+        }
+        public void instanceContext() {
+            staticMethod();
+            siStaticMethod();
+        }
+        public static void staticContext() {
+            staticMethod();
+            siStaticMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodOuterStaticToInnerStatic.java.after

@@ -0,0 +1,17 @@
+public class RenameCollisions {
+    public static void siStaticMethod<caret>() {
+    }
+
+    public static class StaticInnerClass {
+        public static void siStaticMethod() {
+        }
+        public void instanceContext() {
+            RenameCollisions.siStaticMethod();
+            siStaticMethod();
+        }
+        public static void staticContext() {
+            RenameCollisions.siStaticMethod();
+            siStaticMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodStaticToAlien.java

@@ -0,0 +1,10 @@
+import static java.lang.String.valueOf;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static void siMethod<caret>() {}
+        public static void staticContext() {
+            valueOf(0);
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameMethodStaticToAlien.java.after

@@ -0,0 +1,10 @@
+import static java.lang.String.valueOf;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static void valueOf<caret>() {}
+        public static void staticContext() {
+            String.valueOf(0);
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien.java

@@ -0,0 +1,10 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD<caret> = 9;
+        public static void staticContext() {
+            CASE_INSENSITIVE_ORDER.getClass();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien.java.after

@@ -0,0 +1,11 @@
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static final int CASE_INSENSITIVE_ORDER<caret> = 9;
+
+        public static void staticContext() {
+            String.CASE_INSENSITIVE_ORDER.getClass();
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToParam.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD<caret> = 13;
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToParam.java.after

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private class InnerClass {
+        public static final int param3<caret> = 13;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + InnerClass.param3;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarFieldToLocal.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+    private class InnerClass {
+        private int myInnerField<caret> = 15;
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + myInnerField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarFieldToLocal.java.after

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private class InnerClass {
+        private int localVar3<caret> = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + this.localVar3;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarInnerConstToOuterConst.java

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    public static final int STATIC_FIELD = 5;
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD<caret> = 13;
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD + STATIC_FIELD;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarInnerConstToOuterConst.java.after

@@ -0,0 +1,11 @@
+public class RenameCollisions {
+    public static final int STATIC_FIELD = 5;
+    private class InnerClass {
+        public static final int STATIC_FIELD<caret> = 13;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + STATIC_FIELD + RenameCollisions.STATIC_FIELD;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarInnerFieldToOuterField.java

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private int myField = 7;
+    private class InnerClass {
+        private int myInnerField<caret> = 15;
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + myInnerField + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarInnerFieldToOuterField.java.after

@@ -0,0 +1,11 @@
+public class RenameCollisions {
+    private int myField = 7;
+    private class InnerClass {
+        private int myField<caret> = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + myField + RenameCollisions.this.myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToAlien.java

@@ -0,0 +1,10 @@
+import static javax.swing.SwingConstants.BOTTOM;
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static void staticContext() {
+			int localVar<caret> = 0;
+			int var1 = BOTTOM;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToAlien.java.after

@@ -0,0 +1,10 @@
+import javax.swing.*;
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static void staticContext() {
+			int BOTTOM<caret> = 0;
+			int var1 = SwingConstants.BOTTOM;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToConst.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	class InnerClass {
+		public static final int INNER_STATIC_FIELD = 13;
+		public void instanceContext(int param) {
+			int <caret>localVar = 0;
+			int var1 = localVar + param + INNER_STATIC_FIELD;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToConst.java.after

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	class InnerClass {
+		public static final int INNER_STATIC_FIELD = 13;
+		public void instanceContext(int param) {
+			int <caret>INNER_STATIC_FIELD = 0;
+			int var1 = INNER_STATIC_FIELD + param + InnerClass.INNER_STATIC_FIELD;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToOuterField.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	private int myField = 7;
+	class InnerClass {
+		public void instanceContext(int param) {
+			int localVar<caret> = 0;
+			int var1 = localVar + param + myField;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarLocalToOuterField.java.after

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	private int myField = 7;
+	class InnerClass {
+		public void instanceContext(int param) {
+			int myField<caret> = 0;
+			int var1 = myField + param + RenameCollisions.this.myField;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToInnerConst.java

@@ -0,0 +1,17 @@
+public class RenameCollisions {
+    public static final int <caret>STATIC_FIELD = 5;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        public static void staticContext(int param) {
+            int var1 = SI_STATIC_FIELD + STATIC_FIELD;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        public void instanceContext(int param) {
+            int var1 = INNER_STATIC_FIELD + STATIC_FIELD;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToInnerConst.java.after

@@ -0,0 +1,17 @@
+public class RenameCollisions {
+    public static final int <caret>SI_STATIC_FIELD = 5;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        public static void staticContext(int param) {
+            int var1 = SI_STATIC_FIELD + RenameCollisions.SI_STATIC_FIELD;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        public void instanceContext(int param) {
+            int var1 = INNER_STATIC_FIELD + SI_STATIC_FIELD;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToLocal.java

@@ -0,0 +1,28 @@
+public class RenameCollisions {
+    public static final int <caret>STATIC_FIELD = 5;
+    private int myField = 7;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        private int mySiField = 11;
+
+        public void instanceContext(int param1) {
+            int localVar1 = 0;
+            int var1 = localVar1 + param1 + SI_STATIC_FIELD + mySiField + STATIC_FIELD;
+        }
+        public static void staticContext(int param2) {
+            int localVar2 = 0;
+            int var1 = localVar2 + param2 + SI_STATIC_FIELD + STATIC_FIELD;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        private int myInnerField = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD + myInnerField + STATIC_FIELD + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToLocal.java.after

@@ -0,0 +1,28 @@
+public class RenameCollisions {
+    public static final int <caret>localVar3 = 5;
+    private int myField = 7;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        private int mySiField = 11;
+
+        public void instanceContext(int param1) {
+            int localVar1 = 0;
+            int var1 = localVar1 + param1 + SI_STATIC_FIELD + mySiField + localVar3;
+        }
+        public static void staticContext(int param2) {
+            int localVar2 = 0;
+            int var1 = localVar2 + param2 + SI_STATIC_FIELD + localVar3;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        private int myInnerField = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD + myInnerField + RenameCollisions.localVar3 + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToParam.java

@@ -0,0 +1,28 @@
+public class RenameCollisions {
+    public static final int <caret>STATIC_FIELD = 5;
+    private int myField = 7;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        private int mySiField = 11;
+
+        public void instanceContext(int param1) {
+            int localVar1 = 0;
+            int var1 = localVar1 + param1 + SI_STATIC_FIELD + mySiField + STATIC_FIELD;
+        }
+        public static void staticContext(int param2) {
+            int localVar2 = 0;
+            int var1 = localVar2 + param2 + SI_STATIC_FIELD + STATIC_FIELD;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        private int myInnerField = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD + myInnerField + STATIC_FIELD + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterConstToParam.java.after

@@ -0,0 +1,28 @@
+public class RenameCollisions {
+    public static final int <caret>param2 = 5;
+    private int myField = 7;
+
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD = 9;
+        private int mySiField = 11;
+
+        public void instanceContext(int param1) {
+            int localVar1 = 0;
+            int var1 = localVar1 + param1 + SI_STATIC_FIELD + mySiField + param2;
+        }
+        public static void staticContext(int param2) {
+            int localVar2 = 0;
+            int var1 = localVar2 + param2 + SI_STATIC_FIELD + RenameCollisions.param2;
+        }
+    }
+
+    private class InnerClass {
+        public static final int INNER_STATIC_FIELD = 13;
+        private int myInnerField = 15;
+
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + INNER_STATIC_FIELD + myInnerField + param2 + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterFieldToLocal.java

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private int <caret>myField = 7;
+
+    private class InnerClass {
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterFieldToLocal.java.after

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private int <caret>localVar3 = 7;
+
+    private class InnerClass {
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + RenameCollisions.this.localVar3;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterFieldToParam.java

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private int <caret>myField = 7;
+
+    private class InnerClass {
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + myField;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarOuterFieldToParam.java.after

@@ -0,0 +1,10 @@
+public class RenameCollisions {
+    private int <caret>param3 = 7;
+
+    private class InnerClass {
+        public void instanceContext(int param3) {
+            int localVar3 = 0;
+            int var1 = localVar3 + param3 + RenameCollisions.this.param3;
+        }
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToAlien.java

@@ -0,0 +1,9 @@
+import static javax.swing.SwingConstants.BOTTOM;
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static void staticContext(int param<caret>) {
+			int var1 = BOTTOM;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToAlien.java.after

@@ -0,0 +1,9 @@
+import javax.swing.*;
+
+public class RenameCollisions {
+	public static class StaticInnerClass {
+		public static void staticContext(int BOTTOM<caret>) {
+			int var1 = SwingConstants.BOTTOM;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToField.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	class InnerClass {
+		private int myInnerField = 15;
+		public void instanceContext(int param<caret>) {
+			int localVar = 0;
+			int var1 = localVar + param + myInnerField;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToField.java.after

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	class InnerClass {
+		private int myInnerField = 15;
+		public void instanceContext(int myInnerField<caret>) {
+			int localVar = 0;
+			int var1 = localVar + myInnerField + this.myInnerField;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToOuterConst.java

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	public static final int STATIC_FIELD = 5;
+	public static class StaticInnerClass {
+		public void instanceContext(int param<caret>) {
+			int localVar = 0;
+			int var1 = localVar + param + STATIC_FIELD;
+		}
+	}
+}

java/java-tests/testData/refactoring/renameCollisions/RenameVarParamToOuterConst.java.after

@@ -0,0 +1,9 @@
+public class RenameCollisions {
+	public static final int STATIC_FIELD = 5;
+	public static class StaticInnerClass {
+		public void instanceContext(int STATIC_FIELD<caret>) {
+			int localVar = 0;
+			int var1 = localVar + STATIC_FIELD + RenameCollisions.STATIC_FIELD;
+		}
+	}
+}