convert to varargs: ensure parameter type is normalized so old style arrays are conve...

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java
index b92f3ed3411f9e105eaaf09ed22dcd0e4249af11..e62cb016649aed91c2d48e76069cafcbacd7c156 100644 (file)
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java
@@ -75,6 +75,7 @@ public class ConvertToVarargsMethodFix extends InspectionGadgetsFix {
     }
     final PsiParameter[] parameters = parameterList.getParameters();
     final PsiParameter lastParameter = parameters[parameters.length - 1];
+    lastParameter.normalizeDeclaration();
     final PsiType type = lastParameter.getType();
     if (!(type instanceof PsiArrayType)) {
       return;

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.after.java
new file mode 100644 (file)
index 0000000..d3a1ca3
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.after.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2016 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 com.siyeh.igfixes.inheritance.problematic_varargs_method_override;
+
+class One {
+
+  public void m(String... ss) {}
+}
+class Two extends One {
+  public void m(String... ss) {}
+}
+class Three {
+  public static void main(String... args) {
+    new Two().m("1", "2", "3");
+  }
+}
\ No newline at end of file

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.java
new file mode 100644 (file)
index 0000000..7498bdb
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/inheritance/problematic_varargs_method_override/OldStyleArray.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2016 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 com.siyeh.igfixes.inheritance.problematic_varargs_method_override;
+
+class One {
+
+  public void m(String... ss) {}
+}
+class Two extends One {
+  public void m<caret>(String ss[]) {}
+}
+class Three {
+  public static void main(String... args) {
+    new Two().m(new String[]{"1", "2", "3"});
+  }
+}
\ No newline at end of file

diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/inheritance/ProblematicVarargsMethodOverrideFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/inheritance/ProblematicVarargsMethodOverrideFixTest.java
index 0e94dc6c28838479f271a15824982af68ab1df18..4037261acfef2919d6d7c4bebf17937d87a64754 100644 (file)
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/inheritance/ProblematicVarargsMethodOverrideFixTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/inheritance/ProblematicVarargsMethodOverrideFixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -25,6 +25,7 @@ import com.siyeh.ig.inheritance.ProblematicVarargsMethodOverrideInspection;
 public class ProblematicVarargsMethodOverrideFixTest extends IGQuickFixesTestCase {
 
   public void testOne() { doTest(); }
+  public void testOldStyleArray() { doTest(); }
 
   @Override
   protected void setUp() throws Exception {