diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/complex parameter list.sdstest deleted file mode 100644 index f7628dd84..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/complex parameter list.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -annotation A( a: A.B , b: Int ) - -// ----------------------------------------------------------------------------- - -annotation A( - a: A.B, - b: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/long parameter list.sdstest deleted file mode 100644 index 066329102..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/long parameter list.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -annotation A( a: Int , b: Int , c: Int , d: Int ) - -// ----------------------------------------------------------------------------- - -annotation A( - a: Int, - b: Int, - c: Int, - d: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/multiple parameters.sdstest deleted file mode 100644 index ab65d410b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/multiple parameters.sdstest +++ /dev/null @@ -1,34 +0,0 @@ -annotation MyAnnotation ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed optional parameter.sdstest deleted file mode 100644 index 7683ec43e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( const a : Int = 1 ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(const a: Int = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed required parameter.sdstest deleted file mode 100644 index 071d0bc58..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const typed required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( const a : Int ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(const a: Int) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped optional parameter.sdstest deleted file mode 100644 index 511b63460..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( const a = 1 ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(const a = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped required parameter.sdstest deleted file mode 100644 index 30af2bb31..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with const untyped required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( const a ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(const a) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with constraint list.sdstest similarity index 53% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with constraint list.sdstest index 0d855efdc..215490b96 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with constraint list.sdstest @@ -1,5 +1,6 @@ -annotation MyAnnotation ( a : Int ) +annotation MyAnnotation where { + } // ----------------------------------------------------------------------------- -annotation MyAnnotation(a: Int) +annotation MyAnnotation where {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/empty parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/empty parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed optional parameter.sdstest deleted file mode 100644 index d7f259be5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( a : Int = 1 ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(a: Int = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped optional parameter.sdstest deleted file mode 100644 index c9a973832..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -annotation MyAnnotation ( a = 1 ) - -// ----------------------------------------------------------------------------- - -annotation MyAnnotation(a = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/annotated type parameter.sdstest deleted file mode 100644 index 803898a6b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/annotated type parameter.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -class MyClass < @Annotation T > - -// ----------------------------------------------------------------------------- - -class MyClass< - @Annotation - T -> diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter with annotation call.sdstest deleted file mode 100644 index fde132974..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -class MyClass < @Annotation in T > - -// ----------------------------------------------------------------------------- - -class MyClass< - @Annotation - in T -> diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter.sdstest deleted file mode 100644 index 1d6efc467..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/contravariant type parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -class MyClass < in T > - -// ----------------------------------------------------------------------------- - -class MyClass diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter with annotation call.sdstest deleted file mode 100644 index 4e4d6949c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -class MyClass < @Annotation out T > - -// ----------------------------------------------------------------------------- - -class MyClass< - @Annotation - out T -> diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/invariant type parameter.sdstest deleted file mode 100644 index 99534b071..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/invariant type parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -class MyClass < T > - -// ----------------------------------------------------------------------------- - -class MyClass diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/long type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/long type parameter list.sdstest deleted file mode 100644 index 83dc16b67..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/long type parameter list.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -class C< K , V , X , Y > - -// ----------------------------------------------------------------------------- - -class C< - K, - V, - X, - Y -> diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated instance method.sdstest similarity index 70% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated instance method.sdstest index 156742cf9..07b3866a3 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated instance method.sdstest @@ -1,10 +1,11 @@ class MyClass { - @Annotation fun myFunction ( ) + @MyAnnotation fun myFunction ( ) } + // ----------------------------------------------------------------------------- class MyClass { - @Annotation + @MyAnnotation fun myFunction() } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated static method.sdstest similarity index 56% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated static method.sdstest index 77fb88dfe..0542fac1a 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated static method.sdstest @@ -1,9 +1,10 @@ class MyClass { - fun myFunction < out T > ( ) + @MyAnnotation static fun myFunction ( ) } // ----------------------------------------------------------------------------- class MyClass { - fun myFunction() + @MyAnnotation + static fun myFunction() } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated type parameter.sdstest deleted file mode 100644 index b965067aa..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/annotated type parameter.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyClass { - fun myFunction < @Annotation T > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction< - @Annotation - T - >() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter with annotation call.sdstest deleted file mode 100644 index d3049b416..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyClass { - fun myFunction < @Annotation in T > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction< - @Annotation - in T - >() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter.sdstest deleted file mode 100644 index b0672b049..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/contravariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction < in T > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter with annotation call.sdstest deleted file mode 100644 index a31c7e82f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/covariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyClass { - fun myFunction < @Annotation out T > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction< - @Annotation - out T - >() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty constraint list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty constraint list.sdstest deleted file mode 100644 index 1ca500b04..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty constraint list.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) where { } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() where {} -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty type parameter list.sdstest deleted file mode 100644 index 3775b18ab..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/empty type parameter list.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction < > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction<>() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/no parameters and no results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/instance method.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/no parameters and no results.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/instance method.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/invariant type parameter.sdstest deleted file mode 100644 index 049ac65d1..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/invariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction < T > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple parameters.sdstest deleted file mode 100644 index ff5ac1d09..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -class MyClass { - fun myFunction ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple results.sdstest deleted file mode 100644 index 5afbbde82..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple results.sdstest +++ /dev/null @@ -1,23 +0,0 @@ -class MyClass { - fun myFunction ( ) -> ( - @Annotation a , - - b , - - c : Int , - - d : Int - ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> ( - @Annotation - a, - b, - c: Int, - d: Int - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple type parameters.sdstest deleted file mode 100644 index 02ee93eda..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple type parameters.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -class MyClass { - fun myFunction < @Annotation T , in S , out U > ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction< - @Annotation - T, - in S, - out U - >() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/no results (explicit).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/no results (explicit).sdstest deleted file mode 100644 index 0a7b35fe6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/no results (explicit).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) -> ( ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> () -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (in parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (in parentheses).sdstest deleted file mode 100644 index a7bec63c3..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (in parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) -> ( a : Int ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> (a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (no parentheses).sdstest deleted file mode 100644 index d2afc17f6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one typed result (no parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) -> a : Int -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> a: Int -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (no parentheses).sdstest deleted file mode 100644 index 390f3c867..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (no parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) -> a -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> a -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (with parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (with parentheses).sdstest deleted file mode 100644 index 0f85cec7e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/one untyped result (with parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( ) -> ( a ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() -> (a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/static.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/static method.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/static.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/static method.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed optional parameter.sdstest deleted file mode 100644 index 69aee1f15..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( const a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(const a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed required parameter.sdstest deleted file mode 100644 index ccbd4565d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( const a : Int ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(const a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped optional parameter.sdstest deleted file mode 100644 index de5c4a565..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( const a = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(const a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped required parameter.sdstest deleted file mode 100644 index 17164af81..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( const a ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(const a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with multiple constraints.sdstest deleted file mode 100644 index a589fa28a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with multiple constraints.sdstest +++ /dev/null @@ -1,17 +0,0 @@ -class MyClass { - fun myFunction ( ) where { - - T sub Number , - - S super Number - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() where { - T sub Number, - S super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with sub constraint.sdstest deleted file mode 100644 index 1013e15e0..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with sub constraint.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - fun myFunction ( ) where { - T sub Number - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() where { - T sub Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with super constraint.sdstest deleted file mode 100644 index 60ef8bc03..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with super constraint.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -class MyClass { - fun myFunction ( ) where { - - T super Number - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction() where { - T super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed optional parameter.sdstest deleted file mode 100644 index bf987f163..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed required parameter.sdstest deleted file mode 100644 index 9613eddcd..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( a : Int ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped optional parameter.sdstest deleted file mode 100644 index b2be955d6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( a = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped required parameter.sdstest deleted file mode 100644 index 32af588d5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/methods/with untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - fun myFunction ( a ) -} - -// ----------------------------------------------------------------------------- - -class MyClass { - fun myFunction(a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple type parameters.sdstest deleted file mode 100644 index a68e1227d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple type parameters.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -class MyClass < @Annotation T , in S , out U > - -// ----------------------------------------------------------------------------- - -class MyClass< - @Annotation - T, - in S, - out U -> diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated nested class.sdstest similarity index 73% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated nested class.sdstest index 5cdb77ded..07e6f58a1 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated nested class.sdstest @@ -1,10 +1,10 @@ class MyOuterClass { - @Annotation class MyClass + @MyAnnotation class MyClass } // ----------------------------------------------------------------------------- class MyOuterClass { - @Annotation + @MyAnnotation class MyClass } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated type parameter.sdstest deleted file mode 100644 index 07498409a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/annotated type parameter.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyOuterClass { - class MyClass < @Annotation T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass< - @Annotation - T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter with annotation call.sdstest deleted file mode 100644 index 2ed3d7123..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyOuterClass { - class MyClass < @Annotation in T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass< - @Annotation - in T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter.sdstest deleted file mode 100644 index b008b22de..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/contravariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass < in T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter with annotation call.sdstest deleted file mode 100644 index a7be42a8a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -class MyOuterClass { - class MyClass < @Annotation out T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass< - @Annotation - out T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter.sdstest deleted file mode 100644 index 97d72dd17..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/covariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass < out T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty body.sdstest deleted file mode 100644 index be3dd1235..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty body.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass { } -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass {} -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty constraint list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty constraint list.sdstest deleted file mode 100644 index 509de9aac..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty constraint list.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass where { } -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass where {} -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty parameter list.sdstest deleted file mode 100644 index c6b4acdc5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty parameter list.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass() -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty type parameter list.sdstest deleted file mode 100644 index 14f98b903..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/empty type parameter list.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass < > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass<> -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/invariant type parameter.sdstest deleted file mode 100644 index fcfc30c45..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/invariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass < T > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parameters.sdstest deleted file mode 100644 index 810848414..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -class MyOuterClass { - class MyClass ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parent types.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parent types.sdstest deleted file mode 100644 index 4974c5740..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple parent types.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass sub Int , Number -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass sub Int, Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple type parameters.sdstest deleted file mode 100644 index 0fd48754e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/multiple type parameters.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -class MyOuterClass { - class MyClass < @Annotation T , in S , out U > -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass< - @Annotation - T, - in S, - out U - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/minimal.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/nested-class.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/minimal.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/nested-class.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/parent type.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/parent type.sdstest deleted file mode 100644 index 6245987b1..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/parent type.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass sub Int -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass sub Int -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed optional parameter.sdstest deleted file mode 100644 index 074e3289c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( const a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(const a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed required parameter.sdstest deleted file mode 100644 index 75a4c5ae1..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( const a : Int ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(const a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped optional parameter.sdstest deleted file mode 100644 index 77a24ee83..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( const a = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(const a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped required parameter.sdstest deleted file mode 100644 index 380276c04..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( const a ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(const a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with multiple constraints.sdstest deleted file mode 100644 index 969f28c88..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with multiple constraints.sdstest +++ /dev/null @@ -1,18 +0,0 @@ -class MyOuterClass { - class MyClass where { - - T sub Number , - - S super Number - - } -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass where { - T sub Number, - S super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with super constraint.sdstest deleted file mode 100644 index affc2aba1..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with super constraint.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyOuterClass { - class MyClass where { - T super Number - } -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass where { - T super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed optional parameter.sdstest deleted file mode 100644 index 4e602819a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed required parameter.sdstest deleted file mode 100644 index 67059b584..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( a : Int ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped optional parameter.sdstest deleted file mode 100644 index dd6142d9f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( a = 1 ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped required parameter.sdstest deleted file mode 100644 index e2ca23f40..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyOuterClass { - class MyClass ( a ) -} - -// ----------------------------------------------------------------------------- - -class MyOuterClass { - class MyClass(a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotated nested enum.sdstest similarity index 54% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with sub constraint.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotated nested enum.sdstest index a4f41215b..f7a85053a 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested classes/with sub constraint.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotated nested enum.sdstest @@ -1,13 +1,12 @@ class MyOuterClass { - class MyClass where { - T sub Number - } + @MyAnnotation enum MyEnum { MyEnumVariant } } // ----------------------------------------------------------------------------- class MyOuterClass { - class MyClass where { - T sub Number + @MyAnnotation + enum MyEnum { + MyEnumVariant } } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotation call.sdstest deleted file mode 100644 index 74eaf7b60..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/annotation call.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -class MyClass { - @Annotation enum MyEnum -} - -// ----------------------------------------------------------------------------- - -class MyClass { - @Annotation - enum MyEnum -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/empty body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/empty body.sdstest deleted file mode 100644 index 821a0f32b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/empty body.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - enum MyEnum { } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum {} -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/no parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/nested enum.sdstest similarity index 62% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/no parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/nested enum.sdstest index 0c08692a3..dcb3d73e0 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/no parameter list.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/nested enum.sdstest @@ -1,12 +1,10 @@ -class MyClass { - enum MyEnum { - MyEnumVariant - } +class MyOuterClass { + enum MyEnum { MyEnumVariant } } // ----------------------------------------------------------------------------- -class MyClass { +class MyOuterClass { enum MyEnum { MyEnumVariant } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/no body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/no body.sdstest deleted file mode 100644 index 3ba95b00e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/no body.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass { - enum MyEnum -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants in body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants in body.sdstest deleted file mode 100644 index bb39b4aee..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants in body.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotated type parameter.sdstest deleted file mode 100644 index e16c9e40c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotated type parameter.sdstest +++ /dev/null @@ -1,16 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < @Annotation T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant< - @Annotation - T - > - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotation call.sdstest deleted file mode 100644 index 182bae7fa..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/annotation call.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -class MyClass { - enum MyEnum { - @Annotation MyEnumVariant - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - @Annotation - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter with annotation call.sdstest deleted file mode 100644 index a43fcb568..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,16 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < @Annotation in T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant< - @Annotation - in T - > - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter.sdstest deleted file mode 100644 index bc6026aa1..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/contravariant type parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < in T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter with annotation call.sdstest deleted file mode 100644 index b0ba9f682..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,16 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < @Annotation out T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant< - @Annotation - out T - > - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter.sdstest deleted file mode 100644 index e405ad122..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/covariant type parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < out T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/empty type parameter list.sdstest deleted file mode 100644 index 78e3dcdc6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/empty type parameter list.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant<> - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/invariant type parameter.sdstest deleted file mode 100644 index bd77cccc6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/invariant type parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < T > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple parameters.sdstest deleted file mode 100644 index 69cc64866..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple parameters.sdstest +++ /dev/null @@ -1,42 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple type parameters.sdstest deleted file mode 100644 index 05dfd5c69..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/multiple type parameters.sdstest +++ /dev/null @@ -1,18 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant < @Annotation T , in S , out U > - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant< - @Annotation - T, - in S, - out U - > - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed optional parameter.sdstest deleted file mode 100644 index a4dfb647c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed optional parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( const a : Int = 1 ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(const a: Int = 1) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed required parameter.sdstest deleted file mode 100644 index 8297bb617..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const typed required parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( const a : Int ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(const a: Int) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped optional parameter.sdstest deleted file mode 100644 index 0bc669dc9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( const a = 1 ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(const a = 1) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped required parameter.sdstest deleted file mode 100644 index f3d5dd14b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with const untyped required parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( const a ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(const a) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with multiple constraints.sdstest deleted file mode 100644 index aecf34a93..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with multiple constraints.sdstest +++ /dev/null @@ -1,19 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant where { - T sub Number , - S super Number - } - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant where { - T sub Number, - S super Number - } - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with sub constraint.sdstest deleted file mode 100644 index 73e974902..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with sub constraint.sdstest +++ /dev/null @@ -1,17 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant where { - T sub Number - } - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant where { - T sub Number - } - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with super constraint.sdstest deleted file mode 100644 index 622a6ff99..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with super constraint.sdstest +++ /dev/null @@ -1,17 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant where { - T super Number - } - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant where { - T super Number - } - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed optional parameter.sdstest deleted file mode 100644 index 9b1c03acb..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed optional parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( a : Int = 1 ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(a: Int = 1) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed required parameter.sdstest deleted file mode 100644 index 8a18e134f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with typed required parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( a : Int ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(a: Int) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped optional parameter.sdstest deleted file mode 100644 index fe43730f9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped optional parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( a = 1 ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(a = 1) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped required parameter.sdstest deleted file mode 100644 index f42ef72a0..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/nested enums/variants/with untyped required parameter.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -class MyClass { - enum MyEnum { - MyEnumVariant ( a ) - } -} - -// ----------------------------------------------------------------------------- - -class MyClass { - enum MyEnum { - MyEnumVariant(a) - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty constraint list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with constraint list.sdstest similarity index 79% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty constraint list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with constraint list.sdstest index cc46fbac7..bf9ecf914 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty constraint list.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with constraint list.sdstest @@ -1,4 +1,5 @@ -class MyClass where { } +class MyClass where { + } // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with multiple constraints.sdstest deleted file mode 100644 index c804bba16..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with multiple constraints.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -class MyClass where { - - T sub Number , - - S super Number - - } - -// ----------------------------------------------------------------------------- - -class MyClass where { - T sub Number, - S super Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with sub constraint.sdstest deleted file mode 100644 index 717b1af28..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with sub constraint.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass where { - T sub Number - } - -// ----------------------------------------------------------------------------- - -class MyClass where { - T sub Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with super constraint.sdstest deleted file mode 100644 index 67725a957..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with super constraint.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -class MyClass where { - T super Number - } - -// ----------------------------------------------------------------------------- - -class MyClass where { - T super Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with type parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/empty type parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with type parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/multiple constraints.sdstest similarity index 65% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with multiple constraints.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/multiple constraints.sdstest index f0d5b0688..cae5c0389 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with multiple constraints.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/multiple constraints.sdstest @@ -1,8 +1,4 @@ -annotation MyAnnotation where { - T sub Number , - - S super Number - } +annotation MyAnnotation where { T sub Number , S super Number } // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/sub constraint.sdstest similarity index 70% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with sub constraint.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/sub constraint.sdstest index c9de91be8..84f465805 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with sub constraint.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/sub constraint.sdstest @@ -1,6 +1,4 @@ -annotation MyAnnotation where { - T sub Number - } +annotation MyAnnotation where { T sub Number } // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/super constraint.sdstest similarity index 70% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with super constraint.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/super constraint.sdstest index c5cb246ba..5db455325 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with super constraint.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/constraints/super constraint.sdstest @@ -1,6 +1,4 @@ -annotation MyAnnotation where { - T super Number - } +annotation MyAnnotation where { T super Number } // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/annotated type parameter.sdstest deleted file mode 100644 index e044ce70e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/annotated type parameter.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -enum MyEnum { - MyEnumVariant < @Annotation T > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant< - @Annotation - T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/complex parameter list.sdstest deleted file mode 100644 index 585fff906..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/complex parameter list.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -enum E { - A( a: A.B , b: Int ) -} - -// ----------------------------------------------------------------------------- - -enum E { - A( - a: A.B, - b: Int - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter with annotation call.sdstest deleted file mode 100644 index 2fc767b57..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -enum MyEnum { - MyEnumVariant < @Annotation in T > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant< - @Annotation - in T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter.sdstest deleted file mode 100644 index 1c8a3553e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/contravariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant < in T > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter with annotation call.sdstest deleted file mode 100644 index ad529a158..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter with annotation call.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -enum MyEnum { - MyEnumVariant < @Annotation out T > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant< - @Annotation - out T - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter.sdstest deleted file mode 100644 index d059c09fc..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/covariant type parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant < out T > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long parameter list.sdstest deleted file mode 100644 index a27994544..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long parameter list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -enum E { - A( a: Int , b: Int , c: Int , d: Int ) -} - -// ----------------------------------------------------------------------------- - -enum E { - A( - a: Int, - b: Int, - c: Int, - d: Int - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long type parameter list.sdstest deleted file mode 100644 index 78fc5760f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/long type parameter list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -enum E { - A< K , V , X , Y > -} - -// ----------------------------------------------------------------------------- - -enum E { - A< - K, - V, - X, - Y - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple parameters.sdstest deleted file mode 100644 index a2dfec9ec..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -enum MyEnum { - MyEnumVariant ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple type parameters.sdstest deleted file mode 100644 index 5d5cd27ac..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/multiple type parameters.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -enum MyEnum { - MyEnumVariant < @Annotation T , in S , out U > -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant< - @Annotation - T, - in S, - out U - > -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed optional parameter.sdstest deleted file mode 100644 index 976a51fb4..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( const a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(const a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed required parameter.sdstest deleted file mode 100644 index a3bdfdf8f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( const a : Int ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(const a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped optional parameter.sdstest deleted file mode 100644 index 45656583f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( const a = 1 ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(const a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped required parameter.sdstest deleted file mode 100644 index 69f7826ee..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( const a ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(const a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with constraint list.sdstest similarity index 66% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with sub constraint.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with constraint list.sdstest index fff7e5244..da0c8494d 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with sub constraint.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with constraint list.sdstest @@ -1,13 +1,10 @@ enum MyEnum { MyEnumVariant where { - T sub Number } } // ----------------------------------------------------------------------------- enum MyEnum { - MyEnumVariant where { - T sub Number - } + MyEnumVariant where {} } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with multiple constraints.sdstest deleted file mode 100644 index ee8eca3fe..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with multiple constraints.sdstest +++ /dev/null @@ -1,18 +0,0 @@ -enum MyEnum { - MyEnumVariant where { - - T sub Number , - - S super Number - - } -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant where { - T sub Number, - S super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with parameter list.sdstest similarity index 71% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/invariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with parameter list.sdstest index c90eaf89b..e51c49f72 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/invariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with parameter list.sdstest @@ -1,9 +1,9 @@ enum MyEnum { - MyEnumVariant < T > + MyEnumVariant ( ) } // ----------------------------------------------------------------------------- enum MyEnum { - MyEnumVariant + MyEnumVariant() } diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with super constraint.sdstest deleted file mode 100644 index abc4c75a2..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with super constraint.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -enum MyEnum { - MyEnumVariant where { - T super Number - } -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant where { - T super Number - } -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with type parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/empty type parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with type parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed optional parameter.sdstest deleted file mode 100644 index d7efefaa9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( a : Int = 1 ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(a: Int = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed required parameter.sdstest deleted file mode 100644 index 60e8652fb..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( a : Int ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(a: Int) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped optional parameter.sdstest deleted file mode 100644 index e361d229d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( a = 1 ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(a = 1) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped required parameter.sdstest deleted file mode 100644 index f163e978f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/enums/variants/with untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -enum MyEnum { - MyEnumVariant ( a ) -} - -// ----------------------------------------------------------------------------- - -enum MyEnum { - MyEnumVariant(a) -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex parameter list.sdstest deleted file mode 100644 index 3c27aa52b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex parameter list.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -fun f( a: A.B , b: Int ) - -// ----------------------------------------------------------------------------- - -fun f( - a: A.B, - b: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex result list.sdstest deleted file mode 100644 index 8108296b5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/complex result list.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -fun f() -> ( x: A.B , y: Int ) - -// ----------------------------------------------------------------------------- - -fun f() -> ( - x: A.B, - y: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long parameter list.sdstest deleted file mode 100644 index de6e2a7da..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long parameter list.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -fun f( a: Int , b: Int , c: Int , d: Int ) - -// ----------------------------------------------------------------------------- - -fun f( - a: Int, - b: Int, - c: Int, - d: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long result list.sdstest deleted file mode 100644 index 0bffa7df9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long result list.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -fun f() -> ( x: Int , y: Int , a: Int , b: Int ) - -// ----------------------------------------------------------------------------- - -fun f() -> ( - x: Int, - y: Int, - a: Int, - b: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple parameters.sdstest deleted file mode 100644 index 0645897d2..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple parameters.sdstest +++ /dev/null @@ -1,34 +0,0 @@ -fun myFunction ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) - -// ----------------------------------------------------------------------------- - -fun myFunction( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple results.sdstest deleted file mode 100644 index f1dcf6c22..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple results.sdstest +++ /dev/null @@ -1,20 +0,0 @@ -fun myFunction ( ) -> ( - - @Annotation a , - - b , - - c : Int , - - d : Int - ) - -// ----------------------------------------------------------------------------- - -fun myFunction() -> ( - @Annotation - a, - b, - c: Int, - d: Int -) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (in parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (in parentheses).sdstest deleted file mode 100644 index ab4b5849f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (in parentheses).sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( ) -> ( a : Int ) - -// ----------------------------------------------------------------------------- - -fun myFunction() -> (a: Int) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (no parentheses).sdstest deleted file mode 100644 index 64ebd576e..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one typed result (no parentheses).sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( ) -> a : Int - -// ----------------------------------------------------------------------------- - -fun myFunction() -> a: Int diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (no parentheses).sdstest deleted file mode 100644 index a7d782649..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (no parentheses).sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( ) -> a - -// ----------------------------------------------------------------------------- - -fun myFunction() -> a diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (with parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (with parentheses).sdstest deleted file mode 100644 index b957b9ea5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/one untyped result (with parentheses).sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( ) -> ( a ) - -// ----------------------------------------------------------------------------- - -fun myFunction() -> (a) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed optional parameter.sdstest deleted file mode 100644 index f883e6205..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( const a : Int = 1 ) - -// ----------------------------------------------------------------------------- - -fun myFunction(const a: Int = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed required parameter.sdstest deleted file mode 100644 index 93e6cde35..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const typed required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( const a : Int ) - -// ----------------------------------------------------------------------------- - -fun myFunction(const a: Int) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped optional parameter.sdstest deleted file mode 100644 index c5a2e7024..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( const a = 1 ) - -// ----------------------------------------------------------------------------- - -fun myFunction(const a = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped required parameter.sdstest deleted file mode 100644 index dec04ab09..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with const untyped required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( const a ) - -// ----------------------------------------------------------------------------- - -fun myFunction(const a) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with constraint list.sdstest similarity index 58% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with constraint list.sdstest index f622292c7..a2d6bee0a 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/annotations/with untyped required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with constraint list.sdstest @@ -1,5 +1,5 @@ -annotation MyAnnotation ( a ) +fun myFunction ( ) where { } // ----------------------------------------------------------------------------- -annotation MyAnnotation(a) +fun myFunction() where {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with multiple constraints.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with multiple constraints.sdstest deleted file mode 100644 index 5663a7805..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with multiple constraints.sdstest +++ /dev/null @@ -1,13 +0,0 @@ -fun myFunction ( ) where { - T sub Number , - - S super Number - - } - -// ----------------------------------------------------------------------------- - -fun myFunction() where { - T sub Number, - S super Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/no results (explicit).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with result list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/no results (explicit).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with result list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with sub constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with sub constraint.sdstest deleted file mode 100644 index 434cacbff..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with sub constraint.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -fun myFunction ( ) where { - T sub Number - } - -// ----------------------------------------------------------------------------- - -fun myFunction() where { - T sub Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with super constraint.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with super constraint.sdstest deleted file mode 100644 index 562c4796a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with super constraint.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -fun myFunction ( ) where { - T super Number - } - -// ----------------------------------------------------------------------------- - -fun myFunction() where { - T super Number -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/empty type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with type parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/empty type parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with type parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed optional parameter.sdstest deleted file mode 100644 index 320e2d42f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( a : Int = 1 ) - -// ----------------------------------------------------------------------------- - -fun myFunction(a: Int = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed required parameter.sdstest deleted file mode 100644 index 22d946074..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with typed required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( a : Int ) - -// ----------------------------------------------------------------------------- - -fun myFunction(a: Int) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped optional parameter.sdstest deleted file mode 100644 index 5878f16cd..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( a = 1 ) - -// ----------------------------------------------------------------------------- - -fun myFunction(a = 1) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped required parameter.sdstest deleted file mode 100644 index e92311144..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/with untyped required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -fun myFunction ( a ) - -// ----------------------------------------------------------------------------- - -fun myFunction(a) diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/complex parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/complex parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/complex parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/no parameters and no results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/empty parameter list.sdstest similarity index 69% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/no parameters and no results.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/empty parameter list.sdstest index 1d31063fc..b51e9d23f 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/no parameters and no results.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/empty parameter list.sdstest @@ -1,5 +1,5 @@ -fun myFunction ( ) +class MyClass( ) // ----------------------------------------------------------------------------- -fun myFunction() +class MyClass() diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/long parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/long parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/long parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/multiple parameters.sdstest similarity index 96% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple parameters.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/multiple parameters.sdstest index 190886d25..5bef799a5 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/multiple parameters.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/multiple parameters.sdstest @@ -1,4 +1,4 @@ -class MyClass ( +class MyClass( @Annotation a1 , diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed optional parameter.sdstest similarity index 73% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed optional parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed optional parameter.sdstest index 138065d24..d99bf4f89 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed optional parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed optional parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( const a : Int = 1 ) +class MyClass( const a : Int = 1 ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed required parameter.sdstest similarity index 76% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed required parameter.sdstest index 6f4f7252f..8e274653c 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const typed required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const typed required parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( const a : Int ) +class MyClass( const a : Int ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped optional parameter.sdstest similarity index 76% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped optional parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped optional parameter.sdstest index 021895fa2..649d3728e 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped optional parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped optional parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( const a = 1 ) +class MyClass( const a = 1 ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped required parameter.sdstest similarity index 79% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped required parameter.sdstest index 32bd23aa5..834682fc7 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with const untyped required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with const untyped required parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( const a ) +class MyClass( const a ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed optional parameter.sdstest similarity index 76% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed optional parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed optional parameter.sdstest index 498e4353d..4fe81850d 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed optional parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed optional parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( a : Int = 1 ) +class MyClass( a : Int = 1 ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed required parameter.sdstest similarity index 78% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed required parameter.sdstest index 82e69d627..d5e1bf04c 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with typed required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with typed required parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( a : Int ) +class MyClass( a : Int ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped optional parameter.sdstest similarity index 79% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped optional parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped optional parameter.sdstest index 87ae661e8..fd62282f4 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped optional parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped optional parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( a = 1 ) +class MyClass( a = 1 ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped required parameter.sdstest similarity index 82% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped required parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped required parameter.sdstest index 1ac2b0b22..611bf36f5 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/with untyped required parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/parameters/with untyped required parameter.sdstest @@ -1,4 +1,4 @@ -class MyClass ( a ) +class MyClass( a ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/complex result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/complex result list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/complex result list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/complex result list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/long result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/long result list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/long result list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/long result list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/multiple results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/multiple results.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/multiple results.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/multiple results.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/no results (explicit).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/no results (explicit).sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/no results (explicit).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/no results (explicit).sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one typed result (in parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/one typed result (in parentheses).sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one typed result (in parentheses).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/one typed result (in parentheses).sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one typed result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/one typed result (no parentheses).sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one typed result (no parentheses).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/one typed result (no parentheses).sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one untyped result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/one untyped result (no parentheses).sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one untyped result (no parentheses).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/one untyped result (no parentheses).sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one untyped result (with parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/results/one untyped result (with parentheses).sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/one untyped result (with parentheses).sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/results/one untyped result (with parentheses).sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/complex parameter list.sdstest deleted file mode 100644 index 9e5065bca..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/complex parameter list.sdstest +++ /dev/null @@ -1,8 +0,0 @@ -segment s( a: A.B , b: Int ) {} - -// ----------------------------------------------------------------------------- - -segment s( - a: A.B, - b: Int -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/long parameter list.sdstest deleted file mode 100644 index 565f47937..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/long parameter list.sdstest +++ /dev/null @@ -1,10 +0,0 @@ -segment s( a: Int , b: Int , c: Int , d: Int ) {} - -// ----------------------------------------------------------------------------- - -segment s( - a: Int, - b: Int, - c: Int, - d: Int -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/no parameters and no results and empty body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/minimal.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/segments/no parameters and no results and empty body.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/segments/minimal.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/multiple parameters.sdstest deleted file mode 100644 index ad06a581b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/multiple parameters.sdstest +++ /dev/null @@ -1,34 +0,0 @@ -segment mySegment ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed optional parameter.sdstest deleted file mode 100644 index 2e50b1bbf..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( const a : Int = 1 ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(const a: Int = 1) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed required parameter.sdstest deleted file mode 100644 index dfa305f09..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const typed required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( const a : Int ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(const a: Int) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped optional parameter.sdstest deleted file mode 100644 index 248583181..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( const a = 1 ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(const a = 1) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped required parameter.sdstest deleted file mode 100644 index 0a97cd6c9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with const untyped required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( const a ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(const a) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with result list.sdstest similarity index 55% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with result list.sdstest index 43febd0f9..dee2ed60c 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/classes/covariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with result list.sdstest @@ -1,5 +1,5 @@ -class MyClass < out T > +segment mySegment ( ) -> ( ) { } // ----------------------------------------------------------------------------- -class MyClass +segment mySegment() -> () {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed optional parameter.sdstest deleted file mode 100644 index af4508400..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( a : Int = 1 ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(a: Int = 1) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed required parameter.sdstest deleted file mode 100644 index 0d437d58b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with typed required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( a : Int ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(a: Int) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped optional parameter.sdstest deleted file mode 100644 index 2bce54284..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped optional parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( a = 1 ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(a = 1) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped required parameter.sdstest deleted file mode 100644 index ea0eae063..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/segments/with untyped required parameter.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -segment mySegment ( a ) { } - -// ----------------------------------------------------------------------------- - -segment mySegment(a) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter with annotation call.sdstest similarity index 74% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter with annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter with annotation call.sdstest index d6e8b37b3..b1de65f66 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter with annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter with annotation call.sdstest @@ -1,4 +1,4 @@ -fun myFunction < @Annotation in T > ( ) +fun myFunction< @Annotation in T > ( ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter.sdstest similarity index 77% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter.sdstest index a02ea971d..ad1ebf8fe 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/contravariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/contravariant type parameter.sdstest @@ -1,4 +1,4 @@ -fun myFunction < in T > ( ) +fun myFunction< in T >() // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter with annotation call.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter with annotation call.sdstest similarity index 74% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter with annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter with annotation call.sdstest index ba691458a..93cc8d2c8 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter with annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter with annotation call.sdstest @@ -1,4 +1,4 @@ -fun myFunction < @Annotation out T > ( ) +fun myFunction< @Annotation out T > ( ) // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter.sdstest similarity index 77% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter.sdstest index 0b8b00b53..22802a60f 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/covariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/covariant type parameter.sdstest @@ -1,4 +1,4 @@ -fun myFunction < out T > ( ) +fun myFunction< out T >() // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/annotated type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter with annotation call.sdstest similarity index 76% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/annotated type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter with annotation call.sdstest index 30704d78d..1d98b0b9b 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/annotated type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter with annotation call.sdstest @@ -1,4 +1,4 @@ -fun myFunction < @Annotation T > ( ) +fun myFunction< @Annotation T >() // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/invariant type parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter.sdstest similarity index 79% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/invariant type parameter.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter.sdstest index 4a7c6dd89..0ebc55139 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/invariant type parameter.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/invariant type parameter.sdstest @@ -1,4 +1,4 @@ -fun myFunction < T > ( ) +fun myFunction< T >() // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/long type parameter list.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/long type parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/long type parameter list.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple type parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/multiple type parameters.sdstest similarity index 71% rename from packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple type parameters.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/multiple type parameters.sdstest index 4c4c4869c..8d20955bf 100644 --- a/packages/safe-ds-lang/tests/resources/formatting/declarations/functions/multiple type parameters.sdstest +++ b/packages/safe-ds-lang/tests/resources/formatting/declarations/type parameters/multiple type parameters.sdstest @@ -1,4 +1,4 @@ -fun myFunction < @Annotation T , in S , out U > ( ) +fun myFunction< @Annotation T , in S , out U >() // ----------------------------------------------------------------------------- diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/complex parameter list.sdstest deleted file mode 100644 index 19b5d9d0d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/complex parameter list.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -pipeline p { - ( a: A.B , b: Int ){}; -} - -// ----------------------------------------------------------------------------- - -pipeline p { - ( - a: A.B, - b: Int - ) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/long parameter list.sdstest deleted file mode 100644 index a68c125b8..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/long parameter list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -pipeline p { - ( a: Int , b: Int , c: Int , d: Int ) {}; -} - -// ----------------------------------------------------------------------------- - -pipeline p { - ( - a: Int, - b: Int, - c: Int, - d: Int - ) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/no parameters and empty body.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/minimal.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/no parameters and empty body.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/minimal.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/multiple parameters.sdstest deleted file mode 100644 index 8095bf9c8..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -pipeline myPipeline { - ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - ( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed optional parameter.sdstest deleted file mode 100644 index 3879d94ce..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a : Int = 1 ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a: Int = 1) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed required parameter.sdstest deleted file mode 100644 index 1768637ba..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a : Int ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a: Int) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped optional parameter.sdstest deleted file mode 100644 index 36d978825..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a = 1 ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a = 1) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped required parameter.sdstest deleted file mode 100644 index e91492f8b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed optional parameter.sdstest deleted file mode 100644 index c37e4bf97..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a : Int = 1 ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a: Int = 1) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed required parameter.sdstest deleted file mode 100644 index 7eb4216c5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a : Int ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a: Int) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped optional parameter.sdstest deleted file mode 100644 index b045d39aa..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a = 1 ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a = 1) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped required parameter.sdstest deleted file mode 100644 index 8ecee2933..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/block lambdas/with untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a ) { }; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a) {}; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/complex parameter list.sdstest deleted file mode 100644 index 7f08ddc55..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/complex parameter list.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -pipeline p { - ( a: A.B , b: Int ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline p { - ( - a: A.B, - b: Int - ) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed optional parameter.sdstest deleted file mode 100644 index 776166a00..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a = 1 ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a = 1) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed required parameter.sdstest deleted file mode 100644 index 3145dbcb3..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a : Int ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a: Int) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped optional parameter.sdstest deleted file mode 100644 index 0e284b901..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a : Int = 1 ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a: Int = 1) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped required parameter.sdstest deleted file mode 100644 index 9a99bb026..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( const a ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (const a) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/long parameter list.sdstest deleted file mode 100644 index fe3417ba9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/long parameter list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -pipeline p { - ( a: Int , b: Int , c: Int , d: Int ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline p { - ( - a: Int, - b: Int, - c: Int, - d: Int - ) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/no parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/minimal.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/no parameters.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/minimal.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/multiple parameters.sdstest deleted file mode 100644 index 1ee6e5ef9..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -pipeline myPipeline { - ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) -> 4; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - ( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) -> 4; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed optional parameter.sdstest deleted file mode 100644 index dc1040435..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a = 1 ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a = 1) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed required parameter.sdstest deleted file mode 100644 index 42b89fa79..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a : Int ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a: Int) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped optional parameter.sdstest deleted file mode 100644 index 4b7e8022c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a : Int = 1 ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a: Int = 1) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped required parameter.sdstest deleted file mode 100644 index 750140cd2..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/expressions/expression lambdas/untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -pipeline myPipeline { - ( a ) -> 1; -} - -// ----------------------------------------------------------------------------- - -pipeline myPipeline { - (a) -> 1; -} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/without parameters or results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/minimal.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/formatting/types/callable types/without parameters or results.sdstest rename to packages/safe-ds-lang/tests/resources/formatting/types/callable types/minimal.sdstest diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex parameter list.sdstest deleted file mode 100644 index 6d03adefb..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex parameter list.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -segment s( - f: ( a: A.B , b: Int ) -> () -) {} - -// ----------------------------------------------------------------------------- - -segment s( - f: ( - a: A.B, - b: Int - ) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex result list.sdstest deleted file mode 100644 index 8622e3b1d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with complex result list.sdstest +++ /dev/null @@ -1,12 +0,0 @@ -segment s( - f: () -> ( x: A.B , y: Int ) -) {} - -// ----------------------------------------------------------------------------- - -segment s( - f: () -> ( - x: A.B, - y: Int - ) -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed optional parameter.sdstest deleted file mode 100644 index 3754505c2..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( const a : Int = 1 ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (const a: Int = 1) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed required parameter.sdstest deleted file mode 100644 index 1cceaf019..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( const a : Int ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (const a: Int) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped optional parameter.sdstest deleted file mode 100644 index 3754505c2..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( const a : Int = 1 ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (const a: Int = 1) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped required parameter.sdstest deleted file mode 100644 index 173c1e95a..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with const untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( const a ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (const a) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long parameter list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long parameter list.sdstest deleted file mode 100644 index 0494c077b..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long parameter list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -segment s( - f: ( a: Int , b: Int , c: Int , d: Int ) -> () -) {} - -// ----------------------------------------------------------------------------- - -segment s( - f: ( - a: Int, - b: Int, - c: Int, - d: Int - ) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long result list.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long result list.sdstest deleted file mode 100644 index 742b41b13..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with long result list.sdstest +++ /dev/null @@ -1,14 +0,0 @@ -segment s( - f: () -> ( x: Int , y: Int , a: Int , b: Int ) -) {} - -// ----------------------------------------------------------------------------- - -segment s( - f: () -> ( - x: Int, - y: Int, - a: Int, - b: Int - ) -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple parameters.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple parameters.sdstest deleted file mode 100644 index 2c4eabc5f..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple parameters.sdstest +++ /dev/null @@ -1,38 +0,0 @@ -segment mySegment( - f: ( - - @Annotation a1 , - - b1 = 0 , - - c1 : Int , - - d1 : Int = 2 , - - @Annotation const a2 , - - const b2 = 0 , - - const c2 : Int , - - const d2 : Int = 2 - - ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: ( - @Annotation - a1, - b1 = 0, - c1: Int, - d1: Int = 2, - @Annotation - const a2, - const b2 = 0, - const c2: Int, - const d2: Int = 2 - ) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple results.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple results.sdstest deleted file mode 100644 index 4d3d9d323..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with multiple results.sdstest +++ /dev/null @@ -1,20 +0,0 @@ -segment mySegment( - f: ( ) -> ( - @Annotation a , - b , - c : Int , - d : Int - ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: () -> ( - @Annotation - a, - b, - c: Int, - d: Int - ) -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (in parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (in parentheses).sdstest deleted file mode 100644 index 90b959f5c..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (in parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( ) -> ( result : Int ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: () -> (result: Int) -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (no parentheses).sdstest deleted file mode 100644 index 4ed503955..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one typed result (no parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( ) -> result : Int -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: () -> result: Int -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped parameter.sdstest deleted file mode 100644 index 9694b039d..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( param ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (param) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (in parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (in parentheses).sdstest deleted file mode 100644 index e70161c60..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (in parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( ) -> ( result ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: () -> (result) -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (no parentheses).sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (no parentheses).sdstest deleted file mode 100644 index a0341b6c6..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with one untyped result (no parentheses).sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( ) -> result -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: () -> result -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed optional parameter.sdstest deleted file mode 100644 index e19c7ef29..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( a : Int = 1 ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (a: Int = 1) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed required parameter.sdstest deleted file mode 100644 index 26411d9e7..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with typed required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( a : Int ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (a: Int) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped optional parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped optional parameter.sdstest deleted file mode 100644 index e19c7ef29..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped optional parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( a : Int = 1 ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (a: Int = 1) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped required parameter.sdstest b/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped required parameter.sdstest deleted file mode 100644 index 434e234d5..000000000 --- a/packages/safe-ds-lang/tests/resources/formatting/types/callable types/with untyped required parameter.sdstest +++ /dev/null @@ -1,9 +0,0 @@ -segment mySegment( - f: ( a ) -> ( ) -) {} - -// ----------------------------------------------------------------------------- - -segment mySegment( - f: (a) -> () -) {} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-missing parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-missing parameter list.sdstest deleted file mode 100644 index 498a632f5..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-missing parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - fun myFunction -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed constraint list.sdstest deleted file mode 100644 index 0eaeeff59..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed constraint list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - fun myFunction() where { -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed parameter list.sdstest deleted file mode 100644 index 637b8a4f8..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - fun myFunction( -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed result list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed result list.sdstest deleted file mode 100644 index c60f0d9de..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed result list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - fun myFunction() -> ( -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed type parameter list.sdstest deleted file mode 100644 index 7b277e40f..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/bad-unclosed type parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - fun myFunction<() -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotation call.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated instance method.sdstest similarity index 78% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated instance method.sdstest index facc23d9f..726959184 100644 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated instance method.sdstest @@ -1,6 +1,6 @@ // $TEST$ no_syntax_error class MyClass { - @Annotation + @MyAnnotation fun myFunction() } diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated static method.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated static method.sdstest new file mode 100644 index 000000000..4eb3f7d58 --- /dev/null +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-annotated static method.sdstest @@ -0,0 +1,6 @@ +// $TEST$ no_syntax_error + +class MyClass { + @MyAnnotation + static fun myFunction() +} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-instance method.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with parameter list.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-instance method.sdstest diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-static.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-static method.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-static.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-static method.sdstest diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with constraint list.sdstest deleted file mode 100644 index 0ef8b4736..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with constraint list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - fun myFunction() where {} -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with result list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with result list.sdstest deleted file mode 100644 index d0ae9f569..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with result list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - fun myFunction() -> () -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with type parameter list.sdstest deleted file mode 100644 index bb9ef8be8..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/methods/good-with type parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - fun myFunction<>() -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-empty parent type list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-empty parent type list.sdstest deleted file mode 100644 index 0a05ec67e..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-empty parent type list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyOuterClass { - class MyClass sub -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed body.sdstest deleted file mode 100644 index f4152d904..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed body.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyOuterClass { - class MyClass { -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed constraint list.sdstest deleted file mode 100644 index 82070763b..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed constraint list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyOuterClass { - class MyClass where { -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed parameter list.sdstest deleted file mode 100644 index 5c7008153..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyOuterClass { - class MyClass( -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed type parameter list.sdstest deleted file mode 100644 index 43f00552d..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/bad-unclosed type parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyOuterClass { - class MyClass< -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotation call.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotated nested class.sdstest similarity index 79% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotated nested class.sdstest index 78b0330b8..20f749164 100644 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-annotated nested class.sdstest @@ -1,6 +1,6 @@ // $TEST$ no_syntax_error class MyOuterClass { - @Annotation + @MyAnnotation class MyClass } diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-empty body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-empty body.sdstest deleted file mode 100644 index ba9f55304..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-empty body.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass {} -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-multiple parent types.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-multiple parent types.sdstest deleted file mode 100644 index c13836076..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-multiple parent types.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass sub Int, Number -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-minimal.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-nested-class.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-minimal.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-nested-class.sdstest diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-one parent type.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-one parent type.sdstest deleted file mode 100644 index c5add9856..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-one parent type.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass sub Int -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with constraint list.sdstest deleted file mode 100644 index d5ed6c64f..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with constraint list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass where {} -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with parameter list.sdstest deleted file mode 100644 index 62bdbc2d6..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass() -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with type parameter list.sdstest deleted file mode 100644 index a6389af26..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested classes/good-with type parameter list.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyOuterClass { - class MyClass<> -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/bad-unclosed body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/bad-unclosed body.sdstest deleted file mode 100644 index 3d49bba54..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/bad-unclosed body.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - enum MyEnum { -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-annotation call.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotated nested enum.sdstest similarity index 65% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-annotation call.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotated nested enum.sdstest index 4a7b9052d..76b8b7a86 100644 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-annotation call.sdstest +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotated nested enum.sdstest @@ -1,8 +1,8 @@ // $TEST$ no_syntax_error -class MyClass { +class MyOuterClass { + @MyAnnotation enum MyEnum { - @Annotation MyEnumVariant } } diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotation call.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotation call.sdstest deleted file mode 100644 index a2b634af3..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-annotation call.sdstest +++ /dev/null @@ -1,6 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - @Annotation - enum MyEnum -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-empty body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-empty body.sdstest deleted file mode 100644 index d228e3133..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-empty body.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum {} -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-variants in body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-nested enum.sdstest similarity index 78% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-variants in body.sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-nested enum.sdstest index 43204381c..d86fe01cc 100644 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-variants in body.sdstest +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-nested enum.sdstest @@ -1,6 +1,6 @@ // $TEST$ no_syntax_error -class MyClass { +class MyOuterClass { enum MyEnum { MyEnumVariant } diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-no body.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-no body.sdstest deleted file mode 100644 index 5056f93e1..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/good-no body.sdstest +++ /dev/null @@ -1,5 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed constraint list.sdstest deleted file mode 100644 index 8515729dc..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed constraint list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant where { - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed parameter list.sdstest deleted file mode 100644 index cb921cd27..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed parameter list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant( - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed type parameter list.sdstest deleted file mode 100644 index 00e45134b..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/bad-unclosed type parameter list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant< - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-no parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-no parameter list.sdstest deleted file mode 100644 index 43204381c..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-no parameter list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with constraint list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with constraint list.sdstest deleted file mode 100644 index 5ad2a3e70..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with constraint list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant where {} - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with parameter list.sdstest deleted file mode 100644 index 318c180a0..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with parameter list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant() - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with type parameter list.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with type parameter list.sdstest deleted file mode 100644 index 3a9d6f023..000000000 --- a/packages/safe-ds-lang/tests/resources/grammar/declarations/classes/nested enums/variants/good-with type parameter list.sdstest +++ /dev/null @@ -1,7 +0,0 @@ -// $TEST$ no_syntax_error - -class MyClass { - enum MyEnum { - MyEnumVariant<> - } -} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/constraints/good-empty.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/constraints/good-empty.sdstest new file mode 100644 index 000000000..19cb167cf --- /dev/null +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/constraints/good-empty.sdstest @@ -0,0 +1,3 @@ +// $TEST$ no_syntax_error + +annotation MyAnnotation where {} diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/parameters/good-empty.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/parameters/good-empty.sdstest new file mode 100644 index 000000000..fe7486081 --- /dev/null +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/parameters/good-empty.sdstest @@ -0,0 +1,3 @@ +// $TEST$ no_syntax_error + +class MyClass() diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/results/good-no results (explicit).sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/results/good-empty.sdstest similarity index 100% rename from packages/safe-ds-lang/tests/resources/grammar/declarations/results/good-no results (explicit).sdstest rename to packages/safe-ds-lang/tests/resources/grammar/declarations/results/good-empty.sdstest diff --git a/packages/safe-ds-lang/tests/resources/grammar/declarations/type parameters/good-empty.sdstest b/packages/safe-ds-lang/tests/resources/grammar/declarations/type parameters/good-empty.sdstest new file mode 100644 index 000000000..912dae7ab --- /dev/null +++ b/packages/safe-ds-lang/tests/resources/grammar/declarations/type parameters/good-empty.sdstest @@ -0,0 +1,3 @@ +// $TEST$ no_syntax_error + +fun myFunction<>()