fix validator registration, fix tests

Author: lstreckeisen

src/language/ContextMapperDslModule.ts

@@ -72,7 +72,7 @@ export function createContextMapperDslServices (context: DefaultSharedModuleCont
     ContextMapperDslModule
   )
   shared.ServiceRegistry.register(ContextMapperDsl)
-  registerValidationChecks(ContextMapperDsl.validation.ValidationRegistry)
+  registerValidationChecks(ContextMapperDsl.validation.ValidationRegistry, ContextMapperDsl.validation.ContextMapperDslValidator)
   if (!context.connection) {
     // We don't run inside a language server
     // Therefore, initialize the configuration provider instantly

src/language/ContextMapperDslValidator.ts

@@ -1,7 +1,8 @@
-import { AstNode, ValidationRegistry } from 'langium'
+import { AstNode, type ValidationChecks, ValidationRegistry } from 'langium'
 import { ContextMappingModelValidator } from './validation/ContextMappingModelValidator.js'
 import { ValueValidator } from './validation/ValueValidator.js'
 import { AbstractContextMapperValidator } from './validation/AbstractContextMapperValidator.js'
+import type { ContextMapperDslAstType } from './generated/ast.js'
 
 const validators: AbstractContextMapperValidator<AstNode>[] = [
   new ContextMappingModelValidator(),
@@ -11,10 +12,13 @@ const validators: AbstractContextMapperValidator<AstNode>[] = [
 /**
  * Register custom validation checks.
  */
-export function registerValidationChecks (registry: ValidationRegistry) {
+export function registerValidationChecks (registry: ValidationRegistry, validator: ContextMapperDslValidator) {
+  const validatorChecks: ValidationChecks<ContextMapperDslAstType>[] = []
   for (const validator of validators) {
-    registry.register(validator.getChecks, validator)
+    validatorChecks.push(validator.getChecks())
   }
+  const checks: ValidationChecks<ContextMapperDslAstType> = Object.assign({}, ...validatorChecks)
+  registry.register(checks, validator)
 }
 
 export class ContextMapperDslValidator {

test/semnantictokens/BoundedContextSemanticTokens.test.ts

@@ -61,7 +61,7 @@ describe('BoundedContext semantic token test', () => {
     const tokens = extractSemanticTokens(result, expectedNumberOfTokens)
 
     assertSemanticToken(tokens[2], 1, 6, 4, semanticTokenProvider.tokenTypes.keyword, 0)
-    assertSemanticToken(tokens[3], 0, 7, 9, semanticTokenProvider.tokenTypes.property, 0)
+    assertSemanticToken(tokens[3], 0, 7, 9, semanticTokenProvider.tokenTypes.enumMember, 0)
 
     assertSemanticToken(tokens[4], 1, 6, 24, semanticTokenProvider.tokenTypes.keyword, 0)
     assertSemanticToken(tokens[5], 0, 27, 6, semanticTokenProvider.tokenTypes.string, 0)
@@ -77,10 +77,10 @@ describe('BoundedContext semantic token test', () => {
     assertSemanticToken(tokens[12], 0, 24, 6, semanticTokenProvider.tokenTypes.string, 0)
 
     assertSemanticToken(tokens[13], 1, 6, 14, semanticTokenProvider.tokenTypes.keyword, 0)
-    assertSemanticToken(tokens[14], 0, 17, 8, semanticTokenProvider.tokenTypes.property, 0)
+    assertSemanticToken(tokens[14], 0, 17, 8, semanticTokenProvider.tokenTypes.enumMember, 0)
 
     assertSemanticToken(tokens[15], 1, 6, 9, semanticTokenProvider.tokenTypes.keyword, 0)
-    assertSemanticToken(tokens[16], 0, 10, 7, semanticTokenProvider.tokenTypes.property, 0)
+    assertSemanticToken(tokens[16], 0, 10, 7, semanticTokenProvider.tokenTypes.enumMember, 0)
   })
 })