chore: autoformat README, update some hl group links

Author: igorlfs

README.md

@@ -21,8 +21,8 @@
             - [Jumping](#jumping)
             - [Expanding Variables](#expanding-variables)
         - [Highlight Groups](#highlight-groups)
-        - [Filetypes and autocommands](#filetypes-and-autocommands)
-        - [Custom buttons](#custom-buttons)
+        - [Filetypes and Autocommands](#filetypes-and-autocommands)
+        - [Custom Buttons](#custom-buttons)
     - [Roadmap](#roadmap)
     - [Known Issues](#known-issues)
     - [Acknowledgements](#acknowledgements)
@@ -324,39 +324,44 @@ return {
 
 ### Highlight Groups
 
-`nvim-dap-view` defines 22 highlight groups linked to (somewhat) reasonable defaults, but they may look odd with your colorscheme. If the links aren't defined, no highlighting will be applied. To fix that, you have to manually define the highlight groups (see `:h nvim_set_hl()`). Consider contributing to your colorscheme by sending a PR to add support to `nvim-dap-view`!
+`nvim-dap-view` defines 28 highlight groups linked to (somewhat) reasonable defaults, but they may look odd with your colorscheme. If the links aren't defined, no highlighting will be applied. To fix that, you have to manually define the highlight groups (see `:h nvim_set_hl()`). Consider contributing to your colorscheme by sending a PR to add support to `nvim-dap-view`!
 
 <details>
     <summary>Highlight groups</summary>
 
 | Highlight Group                      | Default link                |
 |--------------------------------------|-----------------------------|
 | `NvimDapViewMissingData`             | `DapBreakpoint`             |
-| `NvimDapViewWatchText`               | `Comment`                   |
-| `NvimDapViewWatchTextChanged`        | `DiagnosticVirtualTextWarn` |
 | `NvimDapViewExceptionFilterEnabled`  | `DiagnosticOk`              |
 | `NvimDapViewExceptionFilterDisabled` | `DiagnosticError`           |
 | `NvimDapViewFileName`                | `qfFileName`                |
 | `NvimDapViewLineNumber`              | `qfLineNr`                  |
 | `NvimDapViewSeparator`               | `Comment`                   |
-| `NvimDapViewThread`                  | `@namespace`                |
-| `NvimDapViewThreadStopped`           | `@conditional`              |
+| `NvimDapViewThread`                  | `Tag`                       |
+| `NvimDapViewThreadStopped`           | `Conditional`               |
 | `NvimDapViewTab`                     | `TabLine`                   |
 | `NvimDapViewTabSelected`             | `TabLineSel`                |
 | `NvimDapViewControlNC`               | `Comment`                   |
-| `NvimDapViewControlPlay`             | `@keyword`                  |
-| `NvimDapViewControlPause`            | `@boolean`                  |
-| `NvimDapViewControlStepInto`         | `@function`                 |
-| `NvimDapViewControlStepOut`          | `@function`                 |
-| `NvimDapViewControlStepOver`         | `@function`                 |
-| `NvimDapViewControlStepBack`         | `@function`                 |
-| `NvimDapViewControlRunLast`          | `@keyword`                  |
+| `NvimDapViewControlPlay`             | `Keyword`                   |
+| `NvimDapViewControlPause`            | `Boolean`                   |
+| `NvimDapViewControlStepInto`         | `Function`                  |
+| `NvimDapViewControlStepOut`          | `Function`                  |
+| `NvimDapViewControlStepOver`         | `Function`                  |
+| `NvimDapViewControlStepBack`         | `Function`                  |
+| `NvimDapViewControlRunLast`          | `Keyword`                   |
 | `NvimDapViewControlTerminate`        | `DapBreakpoint`             |
 | `NvimDapViewControlDisconnect`       | `DapBreakpoint`             |
+| `NvimDapViewWatchExpr`               | `Identifier`                |
+| `NvimDapViewWatchError`              | `DiagnosticError`           |
+| `NvimDapViewWatchUpdated`            | `DiagnosticVirtualTextWarn` |
+| `NvimDapViewBoolean`                 | `Boolean`                   |
+| `NvimDapViewString`                  | `String`                    |
+| `NvimDapViewNumber`                  | `Number`                    |
+| `NvimDapViewFloat`                   | `Float`                     |
+| `NvimDapViewFunction`                | `Function`                  |
 
 <details>
 
-
 ### Filetypes and Autocommands
 
 `nvim-dap-view` sets the following filetypes:
@@ -386,9 +391,9 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
 
 </details>
 
-### Custom buttons
+### Custom Buttons
 
-`nvim-dap-view` provides some default buttons for the control bar, but you can also add your own. To do that, in the `controls` table you can use the `custom_buttons` table to declare your new button and then add it at the position you want in the `buttons` list. 
+`nvim-dap-view` provides some default buttons for the control bar, but you can also add your own. To do that, in the `controls` table you can use the `custom_buttons` table to declare your new button and then add it at the position you want in the `buttons` list.
 
 A custom button has 2 methods:
 
@@ -404,42 +409,50 @@ See the `@ N` section in `:help statusline` for the complete specifications of a
     <summary>Example custom buttons</summary>
 
 An example adding 2 buttons:
+
 - `fun`: the most basic button possible, just prints "🎊" when clicked
 - `term_restart`: an hybrid button that acts as a stop/restart button. If the stop button is triggered by anything else than a single left click (middle click, right click, double click or click with a modifier), it will disconnect the session instead.
 
 ```lua
-winbar = {
-  controls = {
-    enabled = true,
-    buttons = {"play", "step_into", "step_over", "step_out", "term_restart", "fun" },
-    custom_buttons = {
-      fun = {
-        render = function() return "🎉" end,
-        action = function() vim.print("🎊") end,
-      },
-      -- Stop/Restart button
-      -- Double click, middle click or click with a modifier disconnect instead of stop
-      term_restart = {
-        render = function()
-          local session = require("dap").session()
-          local group = session and "ControlTerminate" or "ControlRunLast"
-          local icon = session and "" or ""
-          return "%#NvimDapView" .. group .. "#" .. icon .. "%*"
-        end,
-        action = function(clicks, button, modifiers)
-          local dap = require("dap")
-          local alt = clicks > 1 or button ~= "l" or modifiers:gsub(" ", "") ~= ""
-          if not dap.session() then
-            dap.run_last()
-          elseif alt then
-            dap.disconnect()
-          else
-            dap.terminate()
-          end
-        end,
-      },
+-- No need to include the "return" statement
+return {
+    winbar = {
+        controls = {
+            enabled = true,
+            buttons = { "play", "step_into", "step_over", "step_out", "term_restart", "fun" },
+            custom_buttons = {
+                fun = {
+                    render = function()
+                        return "🎉"
+                    end,
+                    action = function()
+                        vim.print("🎊")
+                    end,
+                },
+                -- Stop/Restart button
+                -- Double click, middle click or click with a modifier disconnect instead of stop
+                term_restart = {
+                    render = function()
+                        local session = require("dap").session()
+                        local group = session and "ControlTerminate" or "ControlRunLast"
+                        local icon = session and "" or ""
+                        return "%#NvimDapView" .. group .. "#" .. icon .. "%*"
+                    end,
+                    action = function(clicks, button, modifiers)
+                        local dap = require("dap")
+                        local alt = clicks > 1 or button ~= "l" or modifiers:gsub(" ", "") ~= ""
+                        if not dap.session() then
+                            dap.run_last()
+                        elseif alt then
+                            dap.disconnect()
+                        else
+                            dap.terminate()
+                        end
+                    end,
+                },
+            },
+        },
     },
-  },
 }
 ```
 

lua/dap-view/highlight.lua

@@ -1,19 +1,20 @@
+local globals = require("dap-view.globals")
+
 local api = vim.api
-local prefix = require("dap-view.globals").HL_PREFIX
 
 ---@param name string
 ---@param link string
 local hl_create = function(name, link)
-    api.nvim_set_hl(0, prefix .. name, { link = link })
+    api.nvim_set_hl(0, globals.HL_PREFIX .. name, { link = link })
 end
 
 local define_base_links = function()
     hl_create("MissingData", "DapBreakpoint")
     hl_create("FileName", "qfFileName")
     hl_create("LineNumber", "qfLineNr")
     hl_create("Separator", "Comment")
-    hl_create("Thread", "@namespace")
-    hl_create("ThreadStopped", "@conditional")
+    hl_create("Thread", "Tag")
+    hl_create("ThreadStopped", "Conditional")
 
     hl_create("ExceptionFilterEnabled", "DiagnosticOk")
     hl_create("ExceptionFilterDisabled", "DiagnosticError")
@@ -22,15 +23,16 @@ local define_base_links = function()
     hl_create("TabSelected", "TabLineSel")
 
     hl_create("ControlNC", "Comment")
-    hl_create("ControlPlay", "@keyword")
-    hl_create("ControlPause", "@boolean")
-    hl_create("ControlStepInto", "@function")
-    hl_create("ControlStepOut", "@function")
-    hl_create("ControlStepOver", "@function")
-    hl_create("ControlStepBack", "@function")
-    hl_create("ControlRunLast", "@keyword")
+    hl_create("ControlPlay", "Keyword")
+    hl_create("ControlPause", "Boolean")
+    hl_create("ControlStepInto", "Function")
+    hl_create("ControlStepOut", "Function")
+    hl_create("ControlStepOver", "Function")
+    hl_create("ControlStepBack", "Function")
+    hl_create("ControlRunLast", "Keyword")
     hl_create("ControlTerminate", "DapBreakpoint")
     hl_create("ControlDisconnect", "DapBreakpoint")
+
     hl_create("WatchExpr", "Identifier")
     hl_create("WatchError", "DiagnosticError")
     hl_create("WatchUpdated", "DiagnosticVirtualTextWarn")

lua/dap-view/util/statusline.lua

@@ -1,10 +1,10 @@
 local M = {}
-local prefix = require("dap-view.globals").HL_PREFIX
+local global = require("dap-view.globals")
 
 ---@param text string
 ---@param group string
 M.hl = function(text, group)
-    return "%#" .. prefix .. group .. "#" .. text .. "%*"
+    return "%#" .. global.HL_PREFIX .. group .. "#" .. text .. "%*"
 end
 
 ---@param text string