Fix for #1091: index field reference for delegated assignment in closure

base/org.eclipse.jdt.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyIndexingVisitor.java

@@ -141,14 +141,16 @@ public void visitArrayExpression(final ArrayExpression expression) {
 
     @Override
     public void visitBinaryExpression(final BinaryExpression expression) {
-        if (expression.getOperation().isA(Types.ASSIGNMENT_OPERATOR) &&
-                expression.getLeftExpression() instanceof VariableExpression) {
+        if (expression.getLeftExpression() instanceof VariableExpression &&
+                expression.getOperation().isA(Types.ASSIGNMENT_OPERATOR)) {
             String name = expression.getLeftExpression().getText();
             int offset = expression.getLeftExpression().getStart();
-            // index "setName(x)" for Call Hierarchy/Find References
-            visitNameReference(AccessorSupport.SETTER, name, offset);
+            // index "name"
+            requestor.acceptFieldReference(name.toCharArray(), offset);
             // index "name(x)" for SyntheticAccessorsRenameParticipant
             requestor.acceptMethodReference(name.toCharArray(), 1, offset);
+            // index "setName(x)"
+            visitNameReference(AccessorSupport.SETTER, name, offset);
 
             expression.getRightExpression().visit(this);
         } else {
@@ -305,15 +307,14 @@ public void visitVariableExpression(final VariableExpression expression) {
         if (expression.getEnd() > 0) {
             String name = expression.getName();
             int offset = expression.getStart();
+            // index "name"
+            requestor.acceptFieldReference(name.toCharArray(), offset);
+            // index "name()" for SyntheticAccessorsRenameParticipant
+            requestor.acceptMethodReference(name.toCharArray(), 0, offset);
             // index "getName()" and "isName()"
             visitNameReference(AccessorSupport.GETTER, name, offset);
             visitNameReference(AccessorSupport.ISSER,  name, offset);
-            // index "name()" for SyntheticAccessorsRenameParticipant
-            requestor.acceptMethodReference(name.toCharArray(), 0, offset);
-            // index "name" for package references and anything else?
-            requestor.acceptUnknownReference(name.toCharArray(), offset);
         }
-        //super.visitVariableExpression(expression);
     }
 
     //--------------------------------------------------------------------------

ide-test/org.codehaus.groovy.eclipse.refactoring.test/resources/RenameField/test16/in/A.groovy

@@ -0,0 +1,5 @@
+package p
+
+class MyBean {
+	def fooBar, bar
+}

ide-test/org.codehaus.groovy.eclipse.refactoring.test/resources/RenameField/test16/in/B.groovy

@@ -0,0 +1,8 @@
+package p
+
+void test() {
+	new MyBean().with {
+		fooBar = 'foo'
+		bar = 'bar'
+	}
+}

ide-test/org.codehaus.groovy.eclipse.refactoring.test/resources/RenameField/test16/out/A.groovy

@@ -0,0 +1,5 @@
+package p
+
+class MyBean {
+	def foo, bar
+}

ide-test/org.codehaus.groovy.eclipse.refactoring.test/resources/RenameField/test16/out/B.groovy

@@ -0,0 +1,8 @@
+package p
+
+void test() {
+	new MyBean().with {
+		foo = 'foo'
+		bar = 'bar'
+	}
+}

ide-test/org.codehaus.groovy.eclipse.refactoring.test/src/org/codehaus/groovy/eclipse/refactoring/test/rename/RenameFieldTests.groovy

@@ -227,4 +227,10 @@ final class RenameFieldTests extends RefactoringTestSuite {
         def status = runTest('MyBean', 'foo', 'fooBar')
         assert status.entries[0].message.startsWith('Found potential matches.')
     }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1091
+    void test16() {
+        def status = runTest('MyBean', 'fooBar', 'foo')
+        assert status.isOK()
+    }
 }

ide-test/org.codehaus.groovy.eclipse.refactoring.test/src/org/codehaus/groovy/eclipse/refactoring/test/rename/SyntheticAccessorRenamingTests.groovy

@@ -433,45 +433,45 @@ final class SyntheticAccessorRenamingTests extends RenameRefactoringTestSuite {
         performRefactoringAndUndo('setBar', new TestSource(
             pack: 'p', name: 'Pojo.java',
             contents: '''\
-                package p;
-                public class Pojo {
-                  public void setFoo(int foo) { this.foo = foo; }
-                  public int getFoo() { return this.foo; }
-                  private int foo = -1;
-                }
-                '''.stripIndent(),
-            finalContents: '''\
-                package p;
-                public class Pojo {
-                  public void setBar(int foo) { this.foo = foo; }
-                  public int getFoo() { return this.foo; }
-                  private int foo = -1;
-                }
-                '''.stripIndent()
+                |package p;
+                |public class Pojo {
+                |  public void setFoo(int foo) { this.foo = foo; }
+                |  public int getFoo() { return this.foo; }
+                |  private int foo = -1;
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package p;
+                |public class Pojo {
+                |  public void setBar(int foo) { this.foo = foo; }
+                |  public int getFoo() { return this.foo; }
+                |  private int foo = -1;
+                |}
+                |'''.stripMargin()
         ), new TestSource(
             pack: 'q', name: 'Script.groovy',
             contents: '''\
-                package q
-                import p.Pojo
-                new Pojo().with {
-                    foo = 1
-                    foo += 1
-                    getFoo()
-                    setFoo(3)
-                    def val = foo + 456
-                }
-                '''.stripIndent(),
-            finalContents: '''\
-                package q
-                import p.Pojo
-                new Pojo().with {
-                    bar = 1
-                    bar += 1
-                    getFoo()
-                    setBar(3)
-                    def val = foo + 456
-                }
-                '''.stripIndent()
+                |package q
+                |import p.Pojo
+                |new Pojo().with {
+                |  foo = 1
+                |  foo += 1
+                |  getFoo()
+                |  setFoo(3)
+                |  def val = foo + 456
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package q
+                |import p.Pojo
+                |new Pojo().with {
+                |  bar = 1
+                |  bar += 1
+                |  getFoo()
+                |  setBar(3)
+                |  def val = foo + 456
+                |}
+                |'''.stripMargin()
         ))
     }
 
@@ -482,45 +482,84 @@ final class SyntheticAccessorRenamingTests extends RenameRefactoringTestSuite {
         performRefactoringAndUndo('bar', new TestSource(
             pack: 'p', name: 'Pojo.java',
             contents: '''\
-                package p;
-                public class Pojo {
-                  private int foo = -1;
-                  public int getFoo() { return this.foo; }
-                  public void setFoo(int val) { this.foo = val; }
-                }
-                '''.stripIndent(),
-            finalContents: '''\
-                package p;
-                public class Pojo {
-                  private int bar = -1;
-                  public int getBar() { return this.bar; }
-                  public void setBar(int val) { this.bar = val; }
-                }
-                '''.stripIndent()
+                |package p;
+                |public class Pojo {
+                |  private int foo = -1;
+                |  public int getFoo() { return this.foo; }
+                |  public void setFoo(int val) { this.foo = val; }
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package p;
+                |public class Pojo {
+                |  private int bar = -1;
+                |  public int getBar() { return this.bar; }
+                |  public void setBar(int val) { this.bar = val; }
+                |}
+                |'''.stripMargin()
         ), new TestSource(
             pack: 'q', name: 'Script.groovy',
             contents: '''\
-                package q
-                import p.Pojo
-                new Pojo().with {
-                    foo = 1
-                    foo += 1
-                    getFoo()
-                    setFoo(3)
-                    def val = foo + 456
-                }
-                '''.stripIndent(),
-            finalContents: '''\
-                package q
-                import p.Pojo
-                new Pojo().with {
-                    bar = 1
-                    bar += 1
-                    getBar()
-                    setBar(3)
-                    def val = bar + 456
-                }
-                '''.stripIndent()
+                |package q
+                |import p.Pojo
+                |new Pojo().with {
+                |  foo = 1
+                |  foo += 1
+                |  getFoo()
+                |  setFoo(3)
+                |  def val = foo + 456
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package q
+                |import p.Pojo
+                |new Pojo().with {
+                |  bar = 1
+                |  bar += 1
+                |  getBar()
+                |  setBar(3)
+                |  def val = bar + 456
+                |}
+                |'''.stripMargin()
+        ))
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1091
+    void testMultiFileRename8() {
+        performRefactoringAndUndo('foo', new TestSource(
+            pack: 'p', name: 'Pogo.groovy',
+            contents: '''\
+                |package p
+                |class Pogo {
+                |  def fooBar, bar
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package p
+                |class Pogo {
+                |  def foo, bar
+                |}
+                |'''.stripMargin()
+        ), new TestSource(
+            pack: 'q', name: 'Script.groovy',
+            contents: '''\
+                |package q
+                |import p.Pogo
+                |new Pogo().with {
+                |  fooBar = 1
+                |  fooBar += 1
+                |  def val = fooBar + 456
+                |}
+                |'''.stripMargin(),
+            finalContents: '''\
+                |package q
+                |import p.Pogo
+                |new Pogo().with {
+                |  foo = 1
+                |  foo += 1
+                |  def val = foo + 456
+                |}
+                |'''.stripMargin()
         ))
     }