Bitbake operators in purple

client/syntaxes/bitbake.tmLanguage.json

@@ -265,7 +265,7 @@
         },
         "bitbake-operator": {
             "match": "(?<=:)(append|prepend|remove)",
-            "name": "keyword.other.bitbake-operator.bb"
+            "name": "keyword.control.bb"
         },
         "parenthesis-open": {
             "match": "([\\w])*\\(",

client/test/grammars/test-cases/bitbake-operator.bb

@@ -1,13 +1,13 @@
 # SYNTAX TEST "source.bb" "bitbake-operators"
 
 >KBRANCH:append
-#        ^^^^^^ source.bb keyword.other.bitbake-operator.bb
+#        ^^^^^^ source.bb keyword.control.bb
 
 >KBRANCH:prepend
-#        ^^^^^^^ source.bb keyword.other.bitbake-operator.bb
+#        ^^^^^^^ source.bb keyword.control.bb
 
 >KBRANCH:remove
-#        ^^^^^^ source.bb keyword.other.bitbake-operator.bb
+#        ^^^^^^ source.bb keyword.control.bb
 
 
 >python do_foo:append() {

client/test/grammars/test-cases/variables.bb

@@ -28,7 +28,7 @@
 >FOO:remove = "${FOOREMOVE}"
 #^^^ source.bb variable.other.names.bb
 #                ^^^^^^^^^ source.bb string.quoted.double.bb variable.other.names.bb
-#    ^^^^^^ source.bb keyword.other.bitbake-operator.bb - variable.other.names.bb
+#    ^^^^^^ source.bb keyword.control.bb - variable.other.names.bb
 
 >myfunc (var = '123', var2 = 123) {}
 #        ^^^ source.bb variable.other.names.bb

server/src/__tests__/fixtures/semanticTokens.bb

@@ -1,6 +1,6 @@
 FOO = 'FOO'
 
-MYVAR:append = '${FOO}'
+MYVAR:append:myoverride = '${FOO}'
 
 do_build () {
     echo 'do build'

server/src/__tests__/semanticTokens.test.ts

@@ -40,15 +40,15 @@ describe('Semantic tokens', () => {
         },
         {
           line: 2,
-          startCharacter: 18,
+          startCharacter: 29,
           length: 3,
           tokenType: TOKEN_LEGEND.types.variable,
           tokenModifiers: [TOKEN_LEGEND.modifiers.declaration]
         },
         {
           line: 2,
-          startCharacter: 5,
-          length: 7,
+          startCharacter: 13,
+          length: 10,
           tokenType: TOKEN_LEGEND.types.operator,
           tokenModifiers: [TOKEN_LEGEND.modifiers.readonly]
         },

server/src/tree-sitter/utils.ts

@@ -77,20 +77,14 @@ export function isVariableReference (n: SyntaxNode): boolean {
   }
 }
 
+/**
+ * Check if the node is an override other than `append`, `prepend` or `remove`
+ */
 export function isOverride (n: SyntaxNode): boolean {
-  const parentTypes = [
-    'variable_assignment',
-    'function_definition',
-    'anonymous_python_function',
-    'python_function_definition'
-  ]
   const parentType = n?.parent?.type
   switch (n.type) {
-    case 'override':
-      if (parentType !== undefined) {
-        return parentTypes.includes(parentType)
-      }
-      return false
+    case 'identifier':
+      return parentType === 'override' // As per the tree-sitter grammar, an identifier which has a parent of type override is an override other than `append`, `prepend` or `remove`
     default:
       return false
   }