feat: format upper bound of type parameters (#898)

### Summary of Changes Add missing formatting for the upper bound of type parameters.
Safe-DS · Feb 20, 2024 · 9d6ce28 · 9d6ce28
1 parent 4c577a3
commit 9d6ce28
Show file tree

Hide file tree

Showing 31 changed files with 73 additions and 0 deletions.
diff --git a/packages/safe-ds-lang/src/language/lsp/safe-ds-formatter.ts b/packages/safe-ds-lang/src/language/lsp/safe-ds-formatter.ts
@@ -915,6 +915,7 @@ export class SafeDsFormatter extends AbstractFormatter {
         }
 
         formatter.property('variance').append(oneSpace());
+        formatter.keyword('sub').surround(oneSpace());
         formatter.keyword('=').surround(oneSpace());
     }
 

diff --git a/...atting/declarations/type parameters/bounded contravariant optional type parameter.sdstest b/...atting/declarations/type parameters/bounded contravariant optional type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< in  T  sub  Int  =  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<in T sub Int = Int>()
diff --git a/...atting/declarations/type parameters/bounded contravariant required type parameter.sdstest b/...atting/declarations/type parameters/bounded contravariant required type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< in  T  sub  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<in T sub Int>()
diff --git a/...rations/type parameters/bounded contravariant type parameter with annotation call.sdstest b/...rations/type parameters/bounded contravariant type parameter with annotation call.sdstest
@@ -0,0 +1,8 @@
+fun myFunction< @Annotation  in  T  sub  Int > ( )
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<
+    @Annotation
+    in T sub Int
+>()
diff --git a/...formatting/declarations/type parameters/bounded covariant optional type parameter.sdstest b/...formatting/declarations/type parameters/bounded covariant optional type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< out  T  sub  Int  =  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<out T sub Int = Int>()
diff --git a/...formatting/declarations/type parameters/bounded covariant required type parameter.sdstest b/...formatting/declarations/type parameters/bounded covariant required type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< out  T  sub  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<out T sub Int>()
diff --git a/...eclarations/type parameters/bounded covariant type parameter with annotation call.sdstest b/...eclarations/type parameters/bounded covariant type parameter with annotation call.sdstest
@@ -0,0 +1,8 @@
+fun myFunction< @Annotation  out  T  sub  Int > ( )
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<
+    @Annotation
+    out T sub Int
+>()
diff --git a/...formatting/declarations/type parameters/bounded invariant optional type parameter.sdstest b/...formatting/declarations/type parameters/bounded invariant optional type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< T  sub  Int  =  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<T sub Int = Int>()
diff --git a/...formatting/declarations/type parameters/bounded invariant required type parameter.sdstest b/...formatting/declarations/type parameters/bounded invariant required type parameter.sdstest
@@ -0,0 +1,5 @@
+fun myFunction< T  sub  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<T sub Int>()
diff --git a/...eclarations/type parameters/bounded invariant type parameter with annotation call.sdstest b/...eclarations/type parameters/bounded invariant type parameter with annotation call.sdstest
@@ -0,0 +1,8 @@
+fun myFunction< @Annotation  T  sub  Int >()
+
+// -----------------------------------------------------------------------------
+
+fun myFunction<
+    @Annotation
+    T sub Int
+>()
diff --git a/...ravariant optional type parameter.sdstest → ...ravariant optional type parameter.sdstest b/...ravariant optional type parameter.sdstest → ...ravariant optional type parameter.sdstest
diff --git a/...ravariant required type parameter.sdstest → ...ravariant required type parameter.sdstest b/...ravariant required type parameter.sdstest → ...ravariant required type parameter.sdstest
diff --git a/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest b/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest
diff --git a/...covariant optional type parameter.sdstest → ...covariant optional type parameter.sdstest b/...covariant optional type parameter.sdstest → ...covariant optional type parameter.sdstest
diff --git a/...covariant required type parameter.sdstest → ...covariant required type parameter.sdstest b/...covariant required type parameter.sdstest → ...covariant required type parameter.sdstest
diff --git a/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest b/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest
diff --git a/...invariant optional type parameter.sdstest → ...invariant optional type parameter.sdstest b/...invariant optional type parameter.sdstest → ...invariant optional type parameter.sdstest
diff --git a/...invariant required type parameter.sdstest → ...invariant required type parameter.sdstest b/...invariant required type parameter.sdstest → ...invariant required type parameter.sdstest
diff --git a/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest b/...pe parameter with annotation call.sdstest → ...pe parameter with annotation call.sdstest
diff --git a/...r/declarations/type parameters/good-bounded contravariant optional type parameter.sdstest b/...r/declarations/type parameters/good-bounded contravariant optional type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<in T sub Int = Int>()
diff --git a/...r/declarations/type parameters/good-bounded contravariant required type parameter.sdstest b/...r/declarations/type parameters/good-bounded contravariant required type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<in T sub Int>()
diff --git a/...ammar/declarations/type parameters/good-bounded covariant optional type parameter.sdstest b/...ammar/declarations/type parameters/good-bounded covariant optional type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<out T sub Int = Int>()
diff --git a/...ammar/declarations/type parameters/good-bounded covariant required type parameter.sdstest b/...ammar/declarations/type parameters/good-bounded covariant required type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<out T sub Int>()
diff --git a/...ammar/declarations/type parameters/good-bounded invariant optional type parameter.sdstest b/...ammar/declarations/type parameters/good-bounded invariant optional type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<T sub Int = Int>()
diff --git a/...ammar/declarations/type parameters/good-bounded invariant required type parameter.sdstest b/...ammar/declarations/type parameters/good-bounded invariant required type parameter.sdstest
@@ -0,0 +1,3 @@
+// $TEST$ no_syntax_error
+
+fun myFunction<T sub Int>()
diff --git a/...ravariant optional type parameter.sdstest → ...ravariant optional type parameter.sdstest b/...ravariant optional type parameter.sdstest → ...ravariant optional type parameter.sdstest
diff --git a/...ravariant required type parameter.sdstest → ...ravariant required type parameter.sdstest b/...ravariant required type parameter.sdstest → ...ravariant required type parameter.sdstest
diff --git a/...covariant optional type parameter.sdstest → ...covariant optional type parameter.sdstest b/...covariant optional type parameter.sdstest → ...covariant optional type parameter.sdstest
diff --git a/...covariant required type parameter.sdstest → ...covariant required type parameter.sdstest b/...covariant required type parameter.sdstest → ...covariant required type parameter.sdstest
diff --git a/...invariant optional type parameter.sdstest → ...invariant optional type parameter.sdstest b/...invariant optional type parameter.sdstest → ...invariant optional type parameter.sdstest
diff --git a/...invariant required type parameter.sdstest → ...invariant required type parameter.sdstest b/...invariant required type parameter.sdstest → ...invariant required type parameter.sdstest
-Original file line number
+Diff line change
@@ Expand Up / @@ -915,6 +915,7 @@ export class SafeDsFormatter extends AbstractFormatter { @@
             }
             formatter.property('variance').append(oneSpace());
+            formatter.keyword('sub').surround(oneSpace());
             formatter.keyword('=').surround(oneSpace());
         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<in T sub Int = Int>()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<in T sub Int>()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<out T sub Int = Int>()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<out T sub Int>()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<T sub Int = Int>()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// $TEST$ no_syntax_error

		fun myFunction<T sub Int>()