Go Comment can be colorful

README.md

@@ -762,7 +762,6 @@ require('go').setup({
   tag_options = 'json=omitempty', -- sets options sent to gomodifytags, i.e., json=omitempty
   gotests_template = "", -- sets gotests -template parameter (check gotests for details)
   gotests_template_dir = "", -- sets gotests -template_dir parameter (check gotests for details)
-  comment_placeholder = '' ,  -- comment_placeholder your cool placeholder e.g. 󰟓       
   icons = {breakpoint = '🧘', currentpos = '🏃'},  -- setup to `false` to disable icons setup
   verbose = false,  -- output loginf in messages
   lsp_cfg = false, -- true: use non-default gopls setup specified in go/lsp.lua
@@ -874,6 +873,18 @@ require('go').setup({
   on_stderr = function(err, data)  _, _ = err, data  end, -- callback for stderr
   on_exit = function(code, signal, output)  _, _, _ = code, signal, output  end, -- callback for jobexit, output : string
   iferr_vertical_shift = 4 -- defines where the cursor will end up vertically from the begining of if err statement
+  comment = {
+    placeholder = '' ,  -- comment_placeholder your cool placeholder e.g. 󰟓       
+    queries = nil -- set to a table of queries to use for comment highlight see comment.lua
+    highlight_groups = {  -- default comment highlight groups, see comment.lua
+      -- redefine or set back to Comment to disable
+      -- types      = 'GoCommentType',
+      -- functions  = 'GoCommentFunction',
+      -- variables  = 'GoCommentVariable',
+      -- constants  = 'GoCommentConstant',
+      -- parameters = 'GoCommentParameter',
+    }
+  }
 })
 ```
 

doc/go.txt

@@ -380,7 +380,6 @@ You can setup go.nvim with following options:
   max_line_len = 120,
   tag_transform = false,
   test_dir = "",
-  comment_placeholder = "   ",
   icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable
   -- this option
   verbose = false,
@@ -458,6 +457,12 @@ You can setup go.nvim with following options:
   run_in_floaterm = false, -- set to true to run in float window.
   luasnip = false, -- set true to enable included luasnip
   iferr_vertical_shift = 4 -- defines where the cursor will end up vertically from the begining of if err statement after GoIfErr command
+  comment = {
+    placeholder = '  ',
+    enable_highlight = true, -- set to false to disable
+    queries = nil, -- set to a table of queries to use for comment highlight see comment.lua
+    highlight_groups = nil
+  }
 }
 
 vim:tw=78:ts=8:sts=8:sw=8:ft=help:norl:expandtab

lua/go.lua

@@ -17,7 +17,6 @@ _GO_NVIM_CFG = {
   gotests_template = '', -- sets gotests -template parameter (check gotests for details)
   gotests_template_dir = '', -- sets gotests -template_dir parameter (check gotests for details)
 
-  comment_placeholder = '   ',
   icons = { breakpoint = '🧘', currentpos = '🏃' }, -- set to false to disable icons setup
   sign_priority = 7, -- set priority of signs used by go.nevim
   verbose = false,
@@ -81,9 +80,11 @@ _GO_NVIM_CFG = {
       -- so you will run `watchexe --restart -v -e go go run `
     end,
   },
-  -- deprecated setups for nvim version < 0.10
   lsp_inlay_hints = {
     enable = true,
+
+    -- deprecated setups for nvim version < 0.10
+
     style = 'inlay', -- 'default: inlay', 'eol': show at end of line, 'inlay': show in the middle of the line
 
     -- Note: following setup only for for style == 'eol'
@@ -175,6 +176,12 @@ _GO_NVIM_CFG = {
     _, _, _ = code, signal, output
   end, -- callback for jobexit, output : string
   iferr_vertical_shift = 4, -- defines where the cursor will end up vertically from the begining of if err statement after GoIfErr command
+  comment = {
+    placeholder = '  ',
+    enable_highlight = false, -- set to true to disable
+    queries = nil, -- set to a table of queries to use for comment highlight see comment.lua
+    highlight_groups = nil
+  }
 }
 
 -- TODO: nvim_{add,del}_user_command  https://github.com/neovim/neovim/pull/16752
@@ -216,6 +223,10 @@ function go.setup(cfg)
       vim.log.levels.WARN
     )
   end
+  if cfg.comment_placeholder ~= nil then
+    vim.notify('go.nvim comment_placeholder deprecated, use comment.placeholder', vim.log.levels.WARN)
+    cfg.comment.placeholder = cfg.comment_placeholder
+  end
   if cfg.goimport ~= nil then
     vim.notify('go.nvim goimport deprecated, use goimports', vim.log.levels.WARN)
     cfg.goimports = cfg.goimport
@@ -248,6 +259,7 @@ function go.setup(cfg)
   vim.defer_fn(function()
     require('go.project').load_project()
     require('go.utils').set_nulls()
+    require('go.comment')
   end, 1)
 
   if _GO_NVIM_CFG.run_in_floaterm then