Skip to content

[NETBEANS-4274] fix refactoring of class member when a new name is the same as the name of a local variable #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neilcsmith-net merged 2 commits into from
Jan 17, 2022
Merged

[NETBEANS-4274] fix refactoring of class member when a new name is the same as the name of a local variable #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
042d76c
[NETBEANS-4274] fix refactoring of class member when a new name is th…
jherkel Dec 28, 2020
00c3dde
[NETBEANS-4274] remove unused code
jherkel Feb 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions ...refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,17 +254,11 @@ public boolean accept(Element e, TypeMirror type) {
String useThis = null;
String useSuper = null;

if (elementToFind!=null && elementToFind.getKind().isField()) {
if (elementToFind!=null && elementToFind.getKind().isField() && tree.getKind() == Tree.Kind.IDENTIFIER) {
Scope scope = workingCopy.getTrees().getScope(elementPath);
for (Element ele : scope.getLocalElements()) {
if ((ele.getKind() == ElementKind.LOCAL_VARIABLE || ele.getKind() == ElementKind.PARAMETER)
&& ele.getSimpleName().toString().equals(newName)) {
if (tree.getKind() == Tree.Kind.MEMBER_SELECT) {
String isThis = ((MemberSelectTree) tree).getExpression().toString();
if (isThis.equals("this") || isThis.endsWith(".this")) { // NOI18N
break;
}
}
if (elementToFind.getModifiers().contains(Modifier.STATIC)) {
useThis = elementToFind.getEnclosingElement().getSimpleName().toString() + ".";
} else {
Expand Down
69 changes: 69 additions & 0 deletions ...refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RenameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,75 @@ public void testRenamePropUndoRedo() throws Exception { // #220547

}

public void testRenameLocalVariable_1() throws Exception { // see NETBEANS-4274
writeFilesAndWaitForScan(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private static int i;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(x.i);\n"
+ " }\n"
+ "}"));
JavaRenameProperties props = new JavaRenameProperties();
performRename(src.getFileObject("t/X.java"), 1, -1, "newName", props, true);
verifyContent(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private static int newName;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(x.newName);\n"
+ " }\n"
+ "}"));
}

public void testRenameLocalVariable_2() throws Exception { // see NETBEANS-4274
writeFilesAndWaitForScan(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private int i;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(x.i);\n"
+ " }\n"
+ "}"));
JavaRenameProperties props = new JavaRenameProperties();
performRename(src.getFileObject("t/X.java"), 1, -1, "newName", props, true);
verifyContent(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private int newName;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(x.newName);\n"
+ " }\n"
+ "}"));
}

public void testRenameLocalVariable_3() throws Exception { // see NETBEANS-4274
writeFilesAndWaitForScan(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private static int i;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(i);\n"
+ " }\n"
+ "}"));
JavaRenameProperties props = new JavaRenameProperties();
performRename(src.getFileObject("t/X.java"), 1, -1, "newName", props, true);
verifyContent(src,
new File("t/X.java", "package t;\n"
+ "public class X {\n"
+ " private static int newName;\n"
+ " public static void main(String[] args) {\n"
+ " X x = new X();\n"
+ " String newName = Integer.toString(X.newName);\n"
+ " }\n"
+ "}"));
}

public void test253063() throws Exception {
writeFilesAndWaitForScan(src,
new File("t/A.java", "package t;\n"
Expand Down