feat: error if too many type arguments are provided

Safe-DS · Oct 11, 2023 · a268830 · a268830
1 parent 0ccdeaa
commit a268830
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/src/language/validation/other/types/namedTypes.ts b/src/language/validation/other/types/namedTypes.ts
@@ -1,11 +1,13 @@
 import { SdsNamedType } from '../../../generated/ast.js';
 import { ValidationAcceptor } from 'langium';
 import { SafeDsServices } from '../../../safe-ds-module.js';
-import { typeArgumentsOrEmpty } from '../../../helpers/nodeProperties.js';
+import { typeArgumentsOrEmpty, typeParametersOrEmpty } from '../../../helpers/nodeProperties.js';
 import { duplicatesBy } from '../../../helpers/collectionUtils.js';
+import { pluralize } from '../../../helpers/stringUtils.js';
 
 export const CODE_NAMED_TYPE_DUPLICATE_TYPE_PARAMETER = 'named-type/duplicate-type-parameter';
 export const CODE_NAMED_TYPE_POSITIONAL_AFTER_NAMED = 'named-type/positional-after-named';
+export const CODE_NAMED_TYPE_TOO_MANY_TYPE_ARGUMENTS = 'named-type/too-many-type-arguments';
 
 export const namedTypeMustNotSetTypeParameterMultipleTimes = (services: SafeDsServices) => {
     const nodeMapper = services.helpers.NodeMapper;
@@ -46,3 +48,22 @@ export const namedTypeTypeArgumentListMustNotHavePositionalArgumentsAfterNamedAr
         }
     }
 };
+
+export const namedTypeMustNotHaveTooManyTypeArguments = (node: SdsNamedType, accept: ValidationAcceptor): void => {
+    // If the declaration is unresolved, we already show another error
+    if (!node.declaration.ref) {
+        return
+    }
+
+    const typeParameters = typeParametersOrEmpty(node.declaration.ref);
+    const typeArguments = typeArgumentsOrEmpty(node.typeArgumentList);
+
+    if (typeArguments.length > typeParameters.length) {
+        const kind = pluralize(typeParameters.length, 'type argument');
+        accept('error', `Expected ${typeParameters.length} ${kind} but got ${typeArguments.length}.`, {
+            node,
+            property: 'typeArgumentList',
+            code: CODE_NAMED_TYPE_TOO_MANY_TYPE_ARGUMENTS,
+        });
+    }
+};
diff --git a/src/language/validation/safe-ds-validator.ts b/src/language/validation/safe-ds-validator.ts
@@ -82,6 +82,7 @@ import { memberAccessMustBeNullSafeIfReceiverIsNullable } from './other/expressi
 import { importPackageMustExist, importPackageShouldNotBeEmpty } from './other/imports.js';
 import { singleUseAnnotationsMustNotBeRepeated } from './builtins/repeatable.js';
 import {
+    namedTypeMustNotHaveTooManyTypeArguments,
     namedTypeMustNotSetTypeParameterMultipleTimes,
     namedTypeTypeArgumentListMustNotHavePositionalArgumentsAfterNamedArguments
 } from "./other/types/namedTypes.js";
@@ -143,6 +144,7 @@ export const registerValidationChecks = function (services: SafeDsServices) {
         SdsNamedType: [
             namedTypeDeclarationShouldNotBeDeprecated(services),
             namedTypeDeclarationShouldNotBeExperimental(services),
+            namedTypeMustNotHaveTooManyTypeArguments,
             namedTypeMustNotSetTypeParameterMultipleTimes(services),
             namedTypeMustSetAllTypeParameters(services),
             namedTypeTypeArgumentListShouldBeNeeded,

diff --git a/src/language/validation/types.ts b/src/language/validation/types.ts
@@ -27,7 +27,7 @@ export const namedTypeMustSetAllTypeParameters =
 
             const missingTypeParameters = expectedTypeParameters.filter((it) => !actualTypeParameters.includes(it));
             if (!isEmpty(missingTypeParameters)) {
-                const kind = pluralize(missingTypeParameters.length, 'type parameter', 'type parameters');
+                const kind = pluralize(missingTypeParameters.length, 'type parameter');
                 const missingTypeParametersString = missingTypeParameters.map((it) => `'${it.name}'`).join(', ');
 
                 accept(

diff --git a/...resources/validation/other/types/type argument lists/too many type arguments/main.sdstest b/...resources/validation/other/types/type argument lists/too many type arguments/main.sdstest
@@ -0,0 +1,17 @@
+package tests.validation.other.types.typeArgumentLists.tooManyTypeArguments
+
+class MyClass1<T>
+class MyClass2<A, B>
+
+fun myFunction(
+    // $TEST$ no error r"Expected \d* type arguments? but got \d*\."
+    f: MyClass1»<>«,
+    // $TEST$ no error r"Expected \d* type arguments? but got \d*\."
+    g: MyClass1»<Int>«,
+    // $TEST$ error "Expected 1 type argument but got 2."
+    h: MyClass1»<Int, Int>«,
+    // $TEST$ error "Expected 2 type arguments but got 3."
+    i: MyClass2»<Int, Int, Int>«,
+    // $TEST$ no error r"Expected \d* type arguments? but got \d*\."
+    j: Unresolved»<Int, Int>«
+)