You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/04/16 21:55:54 UTC
[groovy] branch GROOVY_3_0_X updated: GROOVY-10583: do not print generics of type parameter
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 91e25f7f20 GROOVY-10583: do not print generics of type parameter
91e25f7f20 is described below
commit 91e25f7f2070aa3f0712d070c59d810c871b7477
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Apr 16 16:46:04 2022 -0500
GROOVY-10583: do not print generics of type parameter
3_0_X backport
---
.../java/org/codehaus/groovy/ast/GenericsType.java | 65 ++++++++--------------
.../groovy/tools/stubgenerator/Groovy10583.groovy | 48 ++++++++++++++++
2 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/GenericsType.java b/src/main/java/org/codehaus/groovy/ast/GenericsType.java
index cd3db14428..ccef754fb4 100644
--- a/src/main/java/org/codehaus/groovy/ast/GenericsType.java
+++ b/src/main/java/org/codehaus/groovy/ast/GenericsType.java
@@ -92,59 +92,42 @@ public class GenericsType extends ASTNode {
return ret.toString();
}
- private static String nameOf(final ClassNode theType) {
- StringBuilder ret = new StringBuilder();
- if (theType.isArray()) {
- ret.append(nameOf(theType.getComponentType()));
- ret.append("[]");
- } else {
- ret.append(theType.getName());
+ private static String genericsBounds(final ClassNode theType, final Set<String> visited) {
+ StringBuilder ret = appendName(theType, new StringBuilder());
+ GenericsType[] genericsTypes = theType.getGenericsTypes();
+ if (genericsTypes != null && genericsTypes.length > 0
+ && !theType.isGenericsPlaceHolder()) { // GROOVY-10583
+ ret.append('<');
+ for (int i = 0, n = genericsTypes.length; i < n; i += 1) {
+ if (i != 0) ret.append(", ");
+ GenericsType type = genericsTypes[i];
+ if (type.isPlaceholder() && visited.contains(type.getName())) {
+ ret.append(type.getName());
+ } else {
+ ret.append(toString(type, visited));
+ }
+ }
+ ret.append('>');
}
return ret.toString();
}
- private static String genericsBounds(final ClassNode theType, final Set<String> visited) {
- StringBuilder ret = new StringBuilder();
-
+ private static StringBuilder appendName(final ClassNode theType, final StringBuilder sb) {
if (theType.isArray()) {
- ret.append(nameOf(theType));
+ appendName(theType.getComponentType(), sb).append("[]");
} else if (theType.getOuterClass() != null) {
String parentClassNodeName = theType.getOuterClass().getName();
if (Modifier.isStatic(theType.getModifiers()) || theType.isInterface()) {
- ret.append(parentClassNodeName);
+ sb.append(parentClassNodeName);
} else {
- ret.append(genericsBounds(theType.getOuterClass(), new HashSet<>()));
+ sb.append(genericsBounds(theType.getOuterClass(), new HashSet<>()));
}
- ret.append('.');
- ret.append(theType.getName(), parentClassNodeName.length() + 1, theType.getName().length());
+ sb.append('.');
+ sb.append(theType.getName(), parentClassNodeName.length() + 1, theType.getName().length());
} else {
- ret.append(theType.getName());
+ sb.append(theType.isGenericsPlaceHolder() ? theType.getUnresolvedName() : theType.getName());
}
-
- GenericsType[] genericsTypes = theType.getGenericsTypes();
- if (genericsTypes == null || genericsTypes.length == 0) {
- return ret.toString();
- }
-
- // TODO: instead of catching Object<T> here stop it from being placed into type in first place
- if (genericsTypes.length == 1 && genericsTypes[0].isPlaceholder() && theType.getName().equals("java.lang.Object")) {
- return genericsTypes[0].getName();
- }
-
- ret.append('<');
- for (int i = 0, n = genericsTypes.length; i < n; i += 1) {
- if (i != 0) ret.append(", ");
-
- GenericsType type = genericsTypes[i];
- if (type.isPlaceholder() && visited.contains(type.getName())) {
- ret.append(type.getName());
- } else {
- ret.append(toString(type, visited));
- }
- }
- ret.append('>');
-
- return ret.toString();
+ return sb;
}
public String getName() {
diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy
new file mode 100644
index 0000000000..f701a724d6
--- /dev/null
+++ b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy10583.groovy
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.codehaus.groovy.tools.stubgenerator
+
+final class Groovy10583 extends StringSourcesStubTestCase {
+
+ @Override
+ Map<String, String> provideSources() {
+ [
+ 'C.groovy': '''
+ class C {
+ def <S extends CharSequence, N extends Number> List<N>
+ m(Collection<? extends S> input, Class<N> outputType = Integer) {
+ }
+ }
+ ''',
+ 'Main.java': '''
+ public class Main {
+ public static void main(String[] args) {
+ new C();
+ }
+ }
+ ''',
+ ]
+ }
+
+ @Override
+ void verifyStubs() {
+ String stub = stubJavaSourceFor('C')
+ assert stub.contains('Collection<? extends S> input') // not S<S extends java.lang.CharSequence>>
+ }
+}