fix bugs & adjust to modified grammar structure

Author: lstreckeisen

src/language/semantictokens/boundedContext/AggregateSemanticTokenProvider.ts

@@ -1,4 +1,4 @@
-import { Aggregate, isAggregate, isUseCase, isUserRequirement, isUserStory } from '../../generated/ast.js'
+import { Aggregate, isAggregate } from '../../generated/ast.js'
 import { SemanticTokenAcceptor } from 'langium/lsp'
 import { SemanticTokenTypes } from 'vscode-languageserver-types'
 import { highlightField, highlightString, highlightTypeDeclaration } from '../HighlightingHelper.js'
@@ -22,7 +22,15 @@ export class AggregateSemanticTokenProvider implements ContextMapperSemanticToke
     }
 
     if (node.userRequirements.length > 0) {
-      this.highlightUserRequirements(node, acceptor)
+      highlightField(node, acceptor, ['userRequirements', 'features'], 'userRequirements', SemanticTokenTypes.type)
+    }
+
+    if (node.useCases.length > 0) {
+      highlightField(node, acceptor, ['useCases'], 'useCases', SemanticTokenTypes.type)
+    }
+
+    if (node.userStories.length > 0) {
+      highlightField(node, acceptor, ['userStories'], 'userStories', SemanticTokenTypes.type)
     }
 
     if (node.owner) {
@@ -65,19 +73,4 @@ export class AggregateSemanticTokenProvider implements ContextMapperSemanticToke
       highlightField(node, acceptor, ['securityAccessGroup'], 'securityAccessGroup', SemanticTokenTypes.string)
     }
   }
-
-  private highlightUserRequirements (node: Aggregate, acceptor: SemanticTokenAcceptor) {
-    const keywords = []
-    const requirement = node.userRequirements[0].ref
-    if (isUseCase(requirement)) {
-      keywords.push('useCases')
-    } else if (isUserRequirement(requirement)) {
-      keywords.push('userRequirements')
-      keywords.push('features')
-    } else if (isUserStory(requirement)) {
-      keywords.push('userStories')
-    }
-
-    highlightField(node, acceptor, keywords, 'userRequirements', SemanticTokenTypes.type)
-  }
 }

src/language/semantictokens/vdad/ActionSemanticTokenProvider.ts

@@ -3,6 +3,7 @@ import { Action, isAction } from '../../generated/ast.js'
 import { AstNode } from 'langium'
 import { SemanticTokenAcceptor } from 'langium/lsp'
 import { highlightKeyword, highlightString } from '../HighlightingHelper.js'
+import { SemanticTokenTypes } from 'vscode-languageserver-types'
 
 export class ActionSemanticTokenProvider implements ContextMapperSemanticTokenProvider<Action> {
   supports (node: AstNode): node is Action {
@@ -15,7 +16,11 @@ export class ActionSemanticTokenProvider implements ContextMapperSemanticTokenPr
 
     const typeKeywords = ['ACT', 'MONITOR']
     if (typeKeywords.includes(node.type)) {
-      highlightKeyword(node, acceptor, node.type)
+      acceptor({
+        node,
+        type: SemanticTokenTypes.keyword,
+        property: 'type'
+      })
     } else {
       highlightString(node, acceptor, 'type')
     }

src/language/semantictokens/vdad/ValueClusterSemanticTokenProvider.ts

@@ -14,7 +14,7 @@ export class ValueClusterSemanticTokenProvider implements ContextMapperSemanticT
     highlightTypeDeclaration(node, acceptor, 'ValueCluster')
 
     if (node.coreValue) {
-      highlightField(node, acceptor, ['core'], 'coreValue')
+      highlightField(node, acceptor, ['core'], 'coreValue', SemanticTokenTypes.string)
     }
     if (node.coreValue7000) {
       highlightField(node, acceptor, ['core'], 'coreValue7000')

src/language/semantictokens/vdad/ValueRegisterSemanticTokenProvider.ts

@@ -2,18 +2,18 @@ import { ContextMapperSemanticTokenProvider } from '../ContextMapperSemanticToke
 import { isValueRegister, ValueRegister } from '../../generated/ast.js'
 import { AstNode } from 'langium'
 import { SemanticTokenAcceptor } from 'langium/lsp'
-import { highlightAttribute, highlightKeyword } from '../HighlightingHelper.js'
+import { highlightAttribute, highlightTypeDeclaration } from '../HighlightingHelper.js'
 
 export class ValueRegisterSemanticTokenProvider implements ContextMapperSemanticTokenProvider<ValueRegister> {
   supports (node: AstNode): node is ValueRegister {
     return isValueRegister(node)
   }
 
   highlight (node: ValueRegister, acceptor: SemanticTokenAcceptor) {
-    highlightKeyword(node, acceptor, 'ValueRegister')
+    highlightTypeDeclaration(node, acceptor, 'ValueRegister')
 
     if (node.context) {
-      highlightAttribute(node, acceptor, ['of'], 'context')
+      highlightAttribute(node, acceptor, ['for'], 'context')
     }
   }
 }