GROOVY-5692, GROOVY-10006

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -2012,6 +2012,50 @@ public void testTypeChecked9998b() {
         runConformTest(sources, "null");
     }
 
+    @Test
+    public void testTypeChecked10006() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def <T> void a(T one, T two) { }\n" +
+            "def <T> void b(T one, List<T> many) { }\n" +
+            "def <T> void c(T one, T two, T three) { }\n" +
+            "def <T extends Number> void d(T one, T two) { }\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  a(1,'II')\n" +
+            "  b(1,['II','III'])\n" +
+            "  c(1,'II',Class)\n" +
+            "  d(1L,2G)\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "");
+    }
+
+    @Test
+    public void testTypeChecked10006a() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def <T extends Number> void d(T one, T two) { }\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  d(1,'II')\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 4)\n" +
+            "\td(1,'II')\n" +
+            "\t^^^^^^^^^\n" +
+            "Groovy:[Static type checking] - Cannot find matching method Main#d(int, java.lang.String). Please check if the declared type is correct and if the method exists.\n" +
+            "----------\n");
+    }
+
     @Test
     public void testTypeChecked10010() {
         //@formatter:off

base/org.codehaus.groovy25/.checkstyle

@@ -34,9 +34,8 @@
         <file-match-pattern match-pattern="groovy/ast/expr/EmptyExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/expr/FieldExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/expr/(Static)?MethodCallExpression.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/ast/tools/ExpressionUtils.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/ast/tools/GeneralUtils.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/ast/tools/GenericsUtils.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/ast/tools/(Expression|General|Generics)Utils.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/ast/tools/WideningCategories.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/AnnotationVisitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Enum(Completion)?Visitor.java" include-pattern="false" />