bugfix #153, update doc

README.md

@@ -360,6 +360,8 @@ or simply put your cursor in a struct and do
 | GoDebug -s       | stop debug session and unmap debug keymap        |
 | GoDbgKeys        | show debug keymaps in a floating window (guihua) |
 | GoBreakToggle    | GoDebug -b                                       |
+| GoDbgStop        | Same as GoDebug -s                               |
+| GoDbgContinue    | Continue debug session                           |
 | BreakCondition   | conditional break                                |
 
 Notes:
@@ -573,6 +575,7 @@ require('go').setup({
   dap_debug = true, -- set to false to disable dap
   dap_debug_keymap = true, -- true: use keymap for debugger defined in go/dap.lua
                            -- false: do not use keymap in go/dap.lua.  you must define your own.
+                           -- windows: use visual studio keymap
   dap_debug_gui = true, -- set to true to enable dap gui, highly recommand
   dap_debug_vt = true, -- set to true to enable dap virtual text
   build_tags = "tag1,tag2", -- set default build tags

doc/go.txt

@@ -269,6 +269,12 @@ COMMANDS                                                     *go-nvim-commands*
 :GoDbgKeys                                                          *:GoDbgKeys*
         Display keymaps for debuger
 
+:GoDbgStop                                                          *:GoDbgStop*
+        Stop debug session and unmap all keymaps, same as GoDebug -s
+
+:GoDbgContinue                                                      *:GoDbgStop*
+        Continue debug session, keymap `c`
+
 :GoCreateLaunch                                                     *:GoCreateLaunch*
         Create alaunch.json
 
@@ -338,6 +344,7 @@ You can setup go.nvim with following options:
   dap_debug_gui = true,
   dap_debug_keymap = true, -- true: use keymap for debugger defined in go/dap.lua
                            -- false: do not use keymap in go/dap.lua.  you must define your own.
+                           -- windows: use visual studio style of keymap
   dap_vt = true, -- false, true and 'all frames'
   textobjects = true,
   gopls_cmd = nil, --- you can provide gopls path and cmd if it not in PATH, e.g. cmd = {  "/home/ray/.local/nvim/data/lspinstall/go/gopls" }

lua/go.lua

@@ -229,7 +229,8 @@ function go.setup(cfg)
     vim.cmd([[command! DapUiFloat lua require("dapui").float_element()]])
     vim.cmd([[command! DapUiToggle lua require("dapui").toggle()]])
 
-    vim.cmd([[command! GoDbgStop lua require'go.dap'.stop()]])
+    vim.cmd([[command! GoDbgStop lua require'go.dap'.stop(true)]])
+    vim.cmd([[command! GoDbgContinue lua require'dap'.continue()]])
   end
 
   require("go.project").load_project()

lua/go/dap.lua

@@ -68,6 +68,21 @@ local function keybind()
     ["n|P"] = '<cmd>lua require"dap".pause()',
     --
   }
+  if _GO_NVIM_CFG.dap_debug_keymap == "windows" then
+    keys = {
+      -- DAP --
+      -- run
+
+      ["n|<F9>"] = '<cmd>lua require"dap".toggle_breakpoint()',
+      ["n|<F5>"] = '<cmd>lua require"dap".continue()',
+      ["n|<F10>"] = '<cmd>lua require"dap".step_over()',
+      ["n|<C-F10>"] = '<cmd>lua require"dap".run_to_cursor()',
+      ["n|<F11>"] = '<cmd>lua require"dap".step_into()',
+      ["n|<S-F11>"] = '<cmd>lua require"dap".step_out()',
+      ["n|<S-F5>"] = '<cmd>lua require"go.dap".stop()',
+      --
+    }
+  end
   if _GO_NVIM_CFG.dap_debug_gui then
     keys["n|p"] = '<cmd>lua require("dapui").eval()'
     keys["v|p"] = '<cmd>lua require("dapui").eval()'
@@ -99,7 +114,6 @@ local M = {}
 function M.debug_keys()
   local keymap_help = {}
   for key, val in pairs(keys) do
-
     local m = vim.fn.matchlist(val, [[\v(\p+)\.(\p+\(\p*\))]]) -- match last function e.g.float_element("repl")
 
     table.insert(keymap_help, key .. " -> " .. m[3])
@@ -119,7 +133,6 @@ function M.debug_keys()
     })
   end
 
-
   local close_events = { "CursorMoved", "CursorMovedI", "BufHidden", "InsertCharPre" }
   local config = { close_events = close_events, focusable = true, border = "single" }
   vim.lsp.util.open_floating_preview(keymap_help, "lua", config)
@@ -529,6 +542,17 @@ local unmap = function()
     "a",
     "w",
   }
+  if _GO_NVIM_CFG.dap_debug_keymap == "windows" then
+    keys = {
+      "<F9>",
+      "<F5>",
+      "<F10>",
+      "<C-F10>",
+      "<F11>",
+      "<S-F11>",
+      "<S-F5>",
+    }
+  end
   for _, value in pairs(keys) do
     local cmd = "silent! unmap " .. value
     vim.cmd(cmd)