Add type parameters to Java interface declaration

3 files changed, 71 insertions, 0 deletions

diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
index 269b490..7158062 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
@@ -244,6 +244,7 @@ public class JavaWriterTests {
             JavaInterfaceOpenness.OPEN,
             List.of(),
             List.of(),
+            List.of(),
             DocComment.EMPTY
         );
 
@@ -264,6 +265,7 @@ public class JavaWriterTests {
             JavaInterfaceOpenness.SEALED,
             List.of(),
             List.of(),
+            List.of(),
             DocComment.EMPTY
         );
 
@@ -278,10 +280,30 @@ public class JavaWriterTests {
     }
 
     @Test
+    public void sealedInterfaceDeclarationWithTypeParameters() throws IOException {
+        var java = JavaInterfaceDeclaration.arbitrary()
+            .withType(JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("X")))
+            .withOpenness(JavaInterfaceOpenness.OPEN)
+            .addTypeParameter(JavaTypeParameter.arbitrary().withName(JavaIdentifier.of("T1")))
+            .addTypeParameter(JavaTypeParameter.arbitrary().withName(JavaIdentifier.of("T2")))
+            .build();
+
+        var string = write(writer -> writer.writeTypeDeclaration(java));
+
+        assertThat(string, equalTo("""
+            public interface X<T1, T2> {
+                // Custom area start: X body
+                // Custom area end: X body
+            }"""
+        ));
+    }
+
+    @Test
     public void sealedInterfaceDeclarationWithPermitsTypes() throws IOException {
         var java = new JavaInterfaceDeclaration(
             JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("Shape")),
             JavaInterfaceOpenness.SEALED,
+            List.of(),
             List.of(
                 JavaTypeRef.topLevel(JavaPackageName.of("abc", "def"), JavaIdentifier.of("One")),
                 JavaTypeRef.topLevel(JavaPackageName.of("abc", "def"), JavaIdentifier.of("Two"))
@@ -307,6 +329,7 @@ public class JavaWriterTests {
             JavaInterfaceOpenness.OPEN,
             List.of(),
             List.of(),
+            List.of(),
             new DocComment("A 2D shape.")
         );
 
@@ -327,6 +350,7 @@ public class JavaWriterTests {
             JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("Shape")),
             JavaInterfaceOpenness.OPEN,
             List.of(),
+            List.of(),
             List.of(
                 JavaMethodDeclaration.arbitrary()
                     .withName(JavaIdentifier.of("a"))
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java
index e8c039b..046489a 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java
@@ -42,6 +42,12 @@ public final class JavaInterfaceDeclarationMatcher implements org.zwobble.precis
         return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher(submatchers);
     }
 
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher withTypeParameters(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter>> typeParameters) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("typeParameters", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration::typeParameters, typeParameters));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher(submatchers);
+    }
+
     public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher withPermitsTypes(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef>> permitsTypes) {
         var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration>>(this.submatchers);
         submatchers.add(org.zwobble.precisely.Matchers.has("permitsTypes", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration::permitsTypes, permitsTypes));
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java
new file mode 100644
index 0000000..031dc63
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java
@@ -0,0 +1,41 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher imports
+
+public final class JavaTypeParameterMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher isJavaTypeParameter() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter>> submatchers;
+
+    private JavaTypeParameterMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter>> submatchers
+    ) {
+        this.submatchers = submatchers;
+    }
+
+    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
+        return this.toMatcher().match(actual);
+    }
+
+    public org.zwobble.precisely.TextTree describe() {
+        return this.toMatcher().describe();
+    }
+
+    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
+        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher withName(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier> name) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter::name, name));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher body
+}