fix rebasing

Author: wadoon

key.core/src/main/java/de/uka/ilkd/key/nparser/builder/DeclarationBuilder.java

@@ -4,6 +4,8 @@
 package de.uka.ilkd.key.nparser.builder;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.abstraction.KeYJavaType;
@@ -68,8 +70,9 @@ public Object visitDatatype_decl(KeYParser.Datatype_declContext ctx) {
         var origin = BuilderHelpers.getPosition(ctx);
         List<GenericParameter> typeParameters = accept(ctx.formal_sort_param_decls());
         if (typeParameters == null) {
-            var s = new SortImpl(new Name(name), ImmutableSet.empty(), false, doc, origin);
+            var s = new SortImpl(new Name(name), ImmutableSet.empty(), false, origin);
             sorts().addSafely(s);
+            docsSpace().describe(s, doc);
         } else {
             var doubled = CollectionUtil.findDuplicates(typeParameters);
             if (!doubled.isEmpty()) {
@@ -78,10 +81,10 @@ public Object visitDatatype_decl(KeYParser.Datatype_declContext ctx) {
                     doubled.getFirst());
             }
             var s = new ParametricSortDecl(new Name(name), false, ImmutableSet.empty(),
-                ImmutableList.fromList(typeParameters), doc, origin);
+                ImmutableList.fromList(typeParameters), origin);
             namespaces().parametricSorts().addSafely(s);
+            docsSpace().describe(s, doc);
         }
-        docsSpace().describe(s, doc);
         return null;
     }
 
@@ -257,8 +260,13 @@ public Object visitOne_sort_decl(KeYParser.One_sort_declContext ctx) {
                     sortName);
             }
             var sortDecl = new ParametricSortDecl(sortName, isAbstractSort, ext, params,
-                documentation, BuilderHelpers.getPosition(declCtx));
+                    BuilderHelpers.getPosition(declCtx));
             namespaces().parametricSorts().addSafely(sortDecl);
+
+            var doc = processDocumentation(declCtx.DOC_COMMENT());
+            docsSpace().describe(sortDecl,
+                    Stream.of(doc, sectionDoc).filter(Objects::nonNull)
+                            .collect(Collectors.joining("\n")));
         }
         return createdSorts;
     }

key.core/src/test/java/de/uka/ilkd/key/logic/sort/TestAlias.java

@@ -56,8 +56,7 @@ public void testAliasOfParametric() {
         var pSet = new ParametricSortDecl(new Name("PSet"), false, ImmutableSet.empty(),
             ImmutableList.of(
                 new GenericParameter(new GenericSort(new Name("A")),
-                    GenericParameter.Variance.INVARIANT)),
-            "", "");
+                    GenericParameter.Variance.INVARIANT)), "");
         nss.parametricSorts().add(pSet);
         ParametricSortInstance intSet = ParametricSortInstance.get(pSet,
             ImmutableList.of(new GenericArgument(nss.lookupSortOrAlias("int"))), services);

key.core/src/test/java/de/uka/ilkd/key/logic/sort/TestParametricSorts.java

@@ -60,8 +60,7 @@ private ParametricSortDecl addParametricSort(String name,
             GenericSort genSort = (GenericSort) nss.sorts().lookup("G" + (i + 1));
             params = params.prepend(new GenericParameter(genSort, varia));
         }
-        ParametricSortDecl psd = new ParametricSortDecl(new Name(name), false, ImmutableSet.empty(),
-            params, "", "");
+        ParametricSortDecl psd = new ParametricSortDecl(new Name(name), false, ImmutableSet.empty(), params, "");
         nss.parametricSorts().add(psd);
         return psd;
     }