Groovy: fix parsing of variables typed as generics class parameter (#7519)

Author: greg-at-moderne

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

@@ -2743,7 +2743,7 @@ public TypeTree visitVariableExpressionType(@Nullable VariableExpression express
                     emptyList(),
                     typeName,
                     type, null);
-            if (expression.getOriginType().getGenericsTypes() != null) {
+            if (expression.getOriginType().getGenericsTypes() != null && !expression.getOriginType().isGenericsPlaceHolder() && sourceStartsWith("<")) {
                 return new J.ParameterizedType(randomId(), prefix, Markers.EMPTY, ident, visitTypeParameterizations(
                         staticType((org.codehaus.groovy.ast.expr.Expression) expression).getGenericsTypes()), type);
             }

rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java

@@ -233,4 +233,35 @@ void defVariableStartsWithDef() {
           )
         );
     }
+
+    @Test
+    void typeParameterAsLocalVariableType() {
+        rewriteRun(
+          groovy(
+            """
+              class TaskRunner<E> {
+                  void run() {
+                      E task = null
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void typeParameterAsLocalVariableTypeFromMethodCall() {
+        rewriteRun(
+          groovy(
+            """
+              class TaskRunner<E> {
+                  java.util.concurrent.BlockingQueue<E> queue
+                  void run() {
+                      E task = queue.take()
+                  }
+              }
+              """
+          )
+        );
+    }
 }