Comments inside the var statement do not have the right color

[ramya-rao-a]

Description

Comments inside the var statement do not have the right color

Steps to Reproduce

Use the below content:

package main

var /**/ x /**/, y = /**/ 1 /**/, 2 /**/

func main() {}

It appears as below in VS Code that uses the same grammar as available in this repo

Expected behavior: [What you expect to happen]
The comment right next to var should have the scope punctuation.definition.comment.go
The variable x should have the scope variable.other.assignment.go

Actual behavior: [What actually happens]
The comment right next to var has the scope keyword.operator.arithmetic.go
The variable x has the scope source.go

[Arcanemagus]

Confirming this in 1.31.0-nightly9:

Note that this is fixed in the Tree-sitter Go parser: