tests for introduce parameter

plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/GrIntroduceParameterTest.java

@@ -0,0 +1,292 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.refactoring.introduceParameter;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.psi.PsiType;
+import com.intellij.psi.impl.source.PostprocessReformattingAspect;
+import com.intellij.refactoring.IntroduceParameterRefactoring;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import gnu.trove.TIntArrayList;
+import gnu.trove.TObjectIntHashMap;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
+import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
+import org.jetbrains.plugins.groovy.refactoring.introduce.GrIntroduceContext;
+import org.jetbrains.plugins.groovy.refactoring.introduce.GrIntroduceDialog;
+import org.jetbrains.plugins.groovy.refactoring.introduce.parameter.*;
+import org.jetbrains.plugins.groovy.util.TestUtils;
+
+/**
+ * @author Maxim.Medvedev
+ */
+public class GrIntroduceParameterTest extends LightCodeInsightFixtureTestCase {
+  
+    protected String getBasePath() {
+    return TestUtils.getTestDataPath() + "refactoring/introduceParameterGroovy/" + getTestName(true) + '/';
+  }
+
+  private boolean doTest(int replaceFieldsWithGetters, boolean removeUnusedParameters, boolean searchForSuper, boolean declareFinal) {
+    return doTest(replaceFieldsWithGetters, removeUnusedParameters, searchForSuper, declareFinal, null);
+  }
+
+  private boolean doTest(final int replaceFieldsWithGetters,
+                         final boolean removeUnusedParameters,
+                         boolean searchForSuper,
+                         final boolean declareFinal,
+                         final String conflicts) {
+    final String beforeGroovy = getTestName(false)+"Before.groovy";
+    final String afterGroovy = getTestName(false) + "After.groovy";
+    final String clazz = getTestName(false) + "MyClass.groovy";
+    myFixture.configureByFiles(clazz, beforeGroovy);
+
+    execute(replaceFieldsWithGetters, removeUnusedParameters, declareFinal, conflicts);
+
+    PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
+    myFixture.getEditor().getSelectionModel().removeSelection();
+    myFixture.checkResultByFile(beforeGroovy, afterGroovy, true);
+    return true;
+  }
+
+  private void execute(final int replaceFieldsWithGetters,
+                       final boolean removeUnusedParameters,
+                       final boolean declareFinal,
+                       final String conflicts) {
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            try {
+              final GrIntroduceParameterHandler hackedHandler = new GrIntroduceParameterHandler() {
+                @Override
+                protected GrIntroduceDialog<GrIntroduceParameterSettings> getDialog(final GrIntroduceContext context) {
+                  final GrIntroduceParameterSettings hackedSettings =
+                    getSettings(context, removeUnusedParameters, replaceFieldsWithGetters, declareFinal);
+
+
+                  return new GrIntroduceDialog<GrIntroduceParameterSettings>() {
+                    @Override
+                    public GrIntroduceParameterSettings getSettings() {
+                      return null;
+                    }
+
+                    @Override
+                    public void show() {
+                      new GrIntroduceParameterProcessor(hackedSettings, (GrIntroduceParameterContext)context).run();
+                    }
+
+                    @Override
+                    public boolean isOK() {
+                      return false;
+                    }
+                  };
+                }
+              };
+              hackedHandler.invoke(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), null);
+              if (conflicts != null) fail("Conflicts were expected");
+            }
+            catch (Exception e) {
+              if (conflicts == null) {
+                e.printStackTrace();
+                fail("Conflicts were not expected");
+              }
+              assertEquals(conflicts, e.getMessage());
+            }
+          }
+        });
+      }
+    }, "introduce Parameter", null);
+  }
+
+  private GrIntroduceParameterSettings getSettings(final GrIntroduceContext context,
+                                                   final boolean removeUnusedParameters,
+                                                   final int replaceFieldsWithGetters,
+                                                   final boolean declareFinal) {
+    return new GrIntroduceParameterSettings() {
+      @Override
+      public boolean generateDelegate() {
+        return false;
+      }
+
+      @Override
+      public TIntArrayList parametersToRemove() {
+        if (removeUnusedParameters) {
+          final TObjectIntHashMap<GrParameter> parametersToRemove = GroovyIntroduceParameterUtil.findParametersToRemove(context);
+          TIntArrayList list = new TIntArrayList(parametersToRemove.size());
+          for (Object o : parametersToRemove.keys()) {
+            list.add(parametersToRemove.get((GrParameter)o));
+          }
+          return list;
+        }
+        return new TIntArrayList(0);
+      }
+
+      @Override
+      public int replaceFieldsWithGetters() {
+        return replaceFieldsWithGetters;
+      }
+
+      @Override
+      public boolean declareFinal() {
+        return declareFinal;
+      }
+
+      @Override
+      public boolean removeLocalVariable() {
+        return false;
+      }
+
+      @Override
+      public String getName() {
+        return "anObject";
+      }
+
+      @Override
+      public boolean replaceAllOccurrences() {
+        return true;
+      }
+
+      @Override
+      public PsiType getSelectedType() {
+        PsiType type = context.var == null ? context.expression.getType() : context.var.getDeclaredType();
+        return TypesUtil.unboxPrimitiveTypeWrapper(type);
+      }
+    };
+  }
+  
+  
+  public void testSimpleOverridedMethod() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testOverridedMethodWithRemoveUnusedParameters() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, false);
+  }
+
+  public void testSimpleUsage() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testMethodWithoutParams() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testParameterSubstitution() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testThisSubstitution() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testThisSubstitutionInQualifier() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false, "field <b><code>Test.i</code></b> is not accessible from method <b><code>XTest.n()</code></b>. Value for introduced parameter in that method call will be incorrect.");
+  }
+
+  public void testFieldAccess() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testMethodAccess() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testStaticFieldAccess() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testFieldWithGetterReplacement() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, false, false, false);
+  }
+
+  public void testFieldWithInaccessibleGetterReplacement() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+  public void testWeirdQualifier() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+  public void testSuperInExpression() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false, "Parameter initializer contains <b><code>super</code></b>, but not all calls to method are in its class.");
+  }
+
+  public void testWeirdQualifierAndParameter() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+  public void testImplicitSuperCall() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+  public void testImplicitDefaultConstructor() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+  public void testInternalSideEffect() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }
+
+/*  public void testAnonymousClass() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false);
+  }*/
+
+  public void testSuperWithSideEffect() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, false, "Parameter initializer contains <b><code>super</code></b>, but not all calls to method are in its class.");
+  }
+
+  public void testConflictingField() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, true, false);
+  }
+
+  /*public void testParameterJavaDoc1() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true);
+  }
+
+  public void testParameterJavaDoc2() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true);
+  }
+
+  public void testParameterJavaDoc3() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true);
+  }
+
+  public void testParameterJavaDocBeforeVararg() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true);
+  }*/
+
+  public void testRemoveParameterInHierarchy() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, false);
+  }
+
+  /*public void testRemoveParameterWithJavadoc() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, false);
+  }*/
+
+  public void testVarargs() {   // IDEADEV-16828
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testMethodUsageInThisMethodInheritor() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, false);
+  }
+
+  public void testIncorrectArgumentList() {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, true);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameter/fieldWithGetterReplacement/FieldWithGetterReplacementAfter.groovy

@@ -1,6 +1,6 @@
 class XXX {
     public int m() {
         Test t;
-        return t.method(1, 1 + t.getI());
+        return t.method(1, 1 + t.i);
     }
 }

plugins/groovy/testdata/refactoring/introduceParameter/fieldWithInaccessibleGetterReplacement/FieldWithInaccessibleGetterReplacementAfter.groovy

@@ -1,6 +1,6 @@
 class XXX {
     public int m() {
         Test t;
-        return t.method(1, 1 + t.i);
+        return t.method(1, 1 + t.@i);
     }
 }

plugins/groovy/testdata/refactoring/introduceParameterGroovy/conflictingField/ConflictingFieldAfter.groovy

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test2 extends Test1 {
+  public void method(int anObject) {
+    System.out.println(this.anObject);
+  }
+}
+
+public class Usage {
+  {
+    Test t = new Test2();
+    t.method(1 + 2);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/conflictingField/ConflictingFieldBefore.groovy

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test2 extends Test1 {
+  public void method() {
+    System.out.println(anObject);
+  }
+}
+
+public class Usage {
+  {
+    Test t = new Test2();
+    t.method();
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/conflictingField/ConflictingFieldMyClass.groovy

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test {
+    public int anObject;
+    public void method() {
+    }
+}
+
+public class Test1 extends Test {
+    public void method() {
+        System.out.println(<selection>1 + 2</selection>);
+        System.out.println(anObject);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldAccess/FieldAccessAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2, t.i);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldAccess/FieldAccessBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldAccess/FieldAccessMyClass.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int method(int a, int b) {
+        return <selection>i</selection>;
+    }
+    public int i;
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithGetterReplacement/FieldWithGetterReplacementAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XXX {
+    public int m() {
+        Test t;
+        return t.method(1, 1 + t.i);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithGetterReplacement/FieldWithGetterReplacementBefore.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XXX {
+    public int m() {
+        Test t;
+        return t.method(1);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithGetterReplacement/FieldWithGetterReplacementMyClass.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int i;
+
+    public int getI() { return i; }
+
+    int method(int a) {
+        return <selection>a + i</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithInaccessibleGetterReplacement/FieldWithInaccessibleGetterReplacementAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XXX {
+    public int m() {
+        Test t;
+        return t.method(1, 1 + t.@i);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithInaccessibleGetterReplacement/FieldWithInaccessibleGetterReplacementBefore.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XXX {
+    public int m() {
+        Test t;
+        return t.method(1);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/fieldWithInaccessibleGetterReplacement/FieldWithInaccessibleGetterReplacementMyClass.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    public int i;
+
+    public int getI() { return i; }
+
+    int method(int a) {
+        return <selection>a + i</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitDefaultConstructor/ImplicitDefaultConstructorAfter.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class B extends A {
+    B() {
+        super(27)
+    }
+}
+
+class Usage {
+  A a = new B();
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitDefaultConstructor/ImplicitDefaultConstructorBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class B extends A {}
+
+class Usage {
+  A a = new B();
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitDefaultConstructor/ImplicitDefaultConstructorMyClass.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class A {
+    int i;
+    public A() {
+        i = <selection>27</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitSuperCall/ImplicitSuperCallAfter.groovy

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class B extends A {
+  int k;
+
+  public B() {
+      super(27)
+      k = 10;
+  }
+}
+
+class Usage {
+  A a = new B();
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitSuperCall/ImplicitSuperCallBefore.groovy

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class B extends A {
+  int k;
+
+  public B() {
+    k = 10;
+  }
+}
+
+class Usage {
+  A a = new B();
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/implicitSuperCall/ImplicitSuperCallMyClass.groovy

@@ -0,0 +1,6 @@
+class A {
+    int i;
+    public A() {
+        i = <selection>27</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/incorrectArgumentList/IncorrectArgumentListAfter.groovy

@@ -0,0 +1 @@
+new A().foo(27 + 4.5)

plugins/groovy/testdata/refactoring/introduceParameterGroovy/incorrectArgumentList/IncorrectArgumentListBefore.groovy

@@ -0,0 +1 @@
+new A().foo("dsf", 4.5)

plugins/groovy/testdata/refactoring/introduceParameterGroovy/incorrectArgumentList/IncorrectArgumentListMyClass.groovy

@@ -0,0 +1,6 @@
+class A {
+    int i;
+    def foo(int x, double y) {
+        i = <selection>27+y</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/internalSideEffect/InternalSideEffectAfter.groovy

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Usage {
+  int usage(Test[] tests) {
+    int sum = 0;
+    int i = 0;
+    while (i < tests.length) {
+        final Test test = tests[i++]
+        sum += test.method(test.field);
+    }
+
+    List list = Arrays.asList(tests);
+    i = 0;
+    while (i < list.size()) {
+        final Test test = (Test) list.get(i++)
+        sum += test.method(test.field);
+    }
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/internalSideEffect/InternalSideEffectBefore.groovy

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Usage {
+  int usage(Test[] tests) {
+    int sum = 0;
+    int i = 0;
+    while (i < tests.length) {
+      sum += tests[i++].method();
+    }
+
+    List list = Arrays.asList(tests);
+    i = 0;
+    while (i < list.size()) {
+      sum += ((Test) list.get(i++)).method();
+    }
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/internalSideEffect/InternalSideEffectMyClass.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Test {
+    int field;
+    int method() {
+        return <selection>field</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodAccess/MethodAccessAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2, t.anotherMethod(1 + 2));
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodAccess/MethodAccessBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodAccess/MethodAccessMyClass.groovy

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int method(int a, int b) {
+        return <selection>anotherMethod(a + b)</selection>;
+    }
+    int i;
+
+    int anotherMethod(int x) {
+        return x;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodUsageInThisMethodInheritor/MethodUsageInThisMethodInheritorAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class D extends C {
+  int foo(int x, int anObject) {
+    return super.foo(x, anObject);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodUsageInThisMethodInheritor/MethodUsageInThisMethodInheritorBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class D extends C {
+  int foo(int x) {
+    return super.foo(x);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodUsageInThisMethodInheritor/MethodUsageInThisMethodInheritorMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class C {
+  int foo(int x) {
+     return <selection>x+1</selection>;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodWithoutParams/MethodWithoutParamsAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X3 {
+    int n() {
+        Test t;
+        return t.m(0);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodWithoutParams/MethodWithoutParamsBefore.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X3 {
+    int n() {
+        Test t;
+        return t.m();
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/methodWithoutParams/MethodWithoutParamsMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int m() {
+        return <selection>0</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/overridedMethodWithRemoveUnusedParameters/OverridedMethodWithRemoveUnusedParametersAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass extends MyClass {
+  public int m(int y, int anObject) {
+    return 1;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/overridedMethodWithRemoveUnusedParameters/OverridedMethodWithRemoveUnusedParametersBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass extends MyClass {
+  public int m(int x, int y) {
+    return 1; 
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/overridedMethodWithRemoveUnusedParameters/OverridedMethodWithRemoveUnusedParametersMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class MyClass {
+  public int m(int x, int y) {
+    return <selection>x+1</selection>+y;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/parameterSubstitution/ParameterSubstitutionAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2, 1 + 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/parameterSubstitution/ParameterSubstitutionBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/parameterSubstitution/ParameterSubstitutionMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int method(int a, int b) {
+        return <selection>a + b</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/removeParameterInHierarchy/RemoveParameterInHierarchyAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class S extends Bar {
+    public int baz(int anObject) {
+        return super.baz(anObject);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/removeParameterInHierarchy/RemoveParameterInHierarchyBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class S extends Bar {
+    public int baz(byte blah) {
+        return super.baz((byte) 0);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/removeParameterInHierarchy/RemoveParameterInHierarchyMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Bar {
+    public int baz(byte blah) {
+        return <selection>blah + 3</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleOverridedMethod/SimpleOverridedMethodAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass extends MyClass {
+  public int m(int x, int y, int anObject) {
+    return x+y;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleOverridedMethod/SimpleOverridedMethodBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass extends MyClass {
+  public int m(int x, int y) {
+    return x+y; 
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleOverridedMethod/SimpleOverridedMethodMyClass.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class MyClass {
+  public int m(int x, int y) {
+    return <selection>x+1</selection>+y;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleUsage/SimpleUsageAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass {
+  public void exec() {
+    new MyClass().foo(x, y, x + y); 
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleUsage/SimpleUsageBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class GrClass {
+  public void exec() {
+    new MyClass().foo(x, y);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/simpleUsage/SimpleUsageMyClass.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class MyClass {
+  public void foo(int x, int y) {
+    System.out.println(<selection>x+y</selection>);
+    return x+1+y;
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/staticFieldAccess/StaticFieldAccessAfter.groovy

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+    public static int i;
+
+    int yyy(int z) {
+        Test t;
+        return t.method(z, z + Test.i);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/staticFieldAccess/StaticFieldAccessBefore.groovy

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+    public static int i;
+
+    int yyy(int z) {
+        Test t;
+        return t.method(z);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/staticFieldAccess/StaticFieldAccessMyClass.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    public static int i;
+
+    int method(int a) {
+        return <selection>a + i</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superInExpression/SuperInExpressionAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Usage {
+    int m() {
+        T2 test;
+        return test.method(0);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superInExpression/SuperInExpressionBefore.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Usage {
+    int m() {
+        T2 test;
+        return test.method(0);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superInExpression/SuperInExpressionMyClass.groovy

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class T1 {
+    int method(int i) {
+        return 0;
+    }
+}
+
+class T2 extends T1 {
+    int method(int i) {
+        return <selection>super.method(i) + 1</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superWithSideEffect/SuperWithSideEffectAfter.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Usage {
+  int m() {
+    return new T2().method(0);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superWithSideEffect/SuperWithSideEffectBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Usage {
+  int m() {
+    return new T2().method(0);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/superWithSideEffect/SuperWithSideEffectMyClass.groovy

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class T1 {
+    int method(int i) {
+        return 0;
+    }
+}
+
+class T2 extends T1 {
+    int method(int i) {
+        return <selection>super.method(i) + 1</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitution/ThisSubstitutionAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2, t);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitution/ThisSubstitutionBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitution/ThisSubstitutionMyClass.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int method(int a, int b) {
+        return <selection>this</selection>.i;
+    }
+    private int i;
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitutionInQualifier/ThisSubstitutionInQualifierAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitutionInQualifier/ThisSubstitutionInQualifierBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class XTest {
+    int n() {
+        Test t;
+
+        return t.method(1, 2);
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/thisSubstitutionInQualifier/ThisSubstitutionInQualifierMyClass.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    int method(int a, int b) {
+        return <selection>this.i</selection>;
+    }
+    private int i;
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/varargs/VarargsAfter.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test1 {
+  Test t;
+
+  public int n(int v) {
+    return t.m(v, 0, 1);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/varargs/VarargsBefore.groovy

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test1 {
+  Test t;
+
+  public int n(int v) {
+    return t.m(v, 1);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/varargs/VarargsMyClass.groovy

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+   public int m(int a, int... values) {
+        if(a > values.length) {
+           return <selection>0</selection>;
+        }
+        else {
+           return 0;
+        }
+   }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifier/WeirdQualifierAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+  public int n(int a) {
+      final Test test = new Test()
+      return test.m(a, a * 2, test.method(a * 2));
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifier/WeirdQualifierBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+  public int n(int a) {
+    return (new Test()).m(a, a * 2);
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifier/WeirdQualifierMyClass.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test {
+    int method(int i) {
+        return 0;
+    }
+
+    int m(int i, int j) {
+        return i + <selection>method(j)</selection>;
+    }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifierAndParameter/WeirdQualifierAndParameterAfter.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+  public int n(int a) {
+      final Test test = new Test()
+      return (new Test()).m(a, a * 2, test, test.method(a * 2));
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifierAndParameter/WeirdQualifierAndParameterBefore.groovy

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class X {
+  public int n(int a) {
+    return (new Test()).m(a, a * 2, new Test());
+  }
+}

plugins/groovy/testdata/refactoring/introduceParameterGroovy/weirdQualifierAndParameter/WeirdQualifierAndParameterMyClass.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Test {
+    int method(int i) {
+        return 0;
+    }
+
+    int m(int i, int j, Test t) {
+        return i + <selection>t.method(j)</selection>;
+    }
+}