updates for tekichan, and any other commit readers

Author: tjdevries

xdg_config/nvim/after/plugin/dap.lua

@@ -1,16 +1,43 @@
+-- Explore:
+-- - External terminal
+-- - make the virt lines thing available if ppl want it
+-- - find the nearest codelens above cursor
+
 local has_dap, dap = pcall(require, "dap")
 if not has_dap then
   return
 end
 
-dap.set_log_level "TRACE"
+require("nvim-dap-virtual-text").setup {
+  enabled = true,
+
+  -- DapVirtualTextEnable, DapVirtualTextDisable, DapVirtualTextToggle, DapVirtualTextForceRefresh
+  enabled_commands = false,
+
+  -- highlight changed values with NvimDapVirtualTextChanged, else always NvimDapVirtualText
+  highlight_changed_variables = true,
+  highlight_new_as_changed = true,
+
+  -- prefix virtual text with comment string
+  commented = false,
+
+  show_stop_reason = true,
+
+  -- experimental features:
+  virt_text_pos = "eol", -- position of virtual text, see `:h nvim_buf_set_extmark()`
+  all_frames = false, -- show virtual text for all stack frames not only current. Only works for debugpy on my machine.
+}
 
 -- TODO: How does terminal work?
 dap.defaults.fallback.external_terminal = {
   command = "/home/tjdevries/.local/bin/kitty",
   args = { "-e" },
 }
 
+dap.adapters.nlua = function(callback, config)
+  callback { type = "server", host = config.host, port = config.port }
+end
+
 dap.configurations.lua = {
   {
     type = "nlua",
@@ -28,25 +55,6 @@ dap.configurations.lua = {
   },
 }
 
-dap.adapters.nlua = function(callback, config)
-  callback { type = "server", host = config.host, port = config.port }
-end
-
-vim.g.dap_virtual_text = true
-
--- dap.adapters.cpp = {
---   type = 'executable',
---   attach = {
---     pidProperty = "pid",
---     pidSelect = "ask"
---   },
---   command = 'lldb-vscode-11',
---   env = {
---     LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY = "YES"
---   },
---   name = "lldb"
--- }
-
 dap.adapters.c = {
   name = "lldb",
 
@@ -175,6 +183,26 @@ dap.configurations.c = {
     cwd = vim.fn.expand "~/build/neovim",
     gdbpath = vim.fn.exepath "gdb",
   },
+  -- {
+  --   name = "Launch rust-analyzer lsif",
+  --   type = "lldb",
+  --   request = "launch",
+  --   program = "/home/tjdevries/sourcegraph/rust-analyzer.git/monikers-1/target/debug/rust-analyzer",
+  --   args = { "lsif", "/home/tjdevries/build/rmpv/" },
+  --   cwd = "/home/tjdevries/sourcegraph/rust-analyzer.git/monikers-1/",
+  --   stopOnEntry = false,
+  --   runInTerminal = false,
+  -- },
+  {
+    name = "Launch ./build/bin/nvim",
+    type = "lldb",
+    request = "launch",
+    program = "/home/tjdevries/build/neovim.git/lua_autocmd/build/bin/nvim",
+    args = { "--headless" },
+    cwd = "/home/tjdevries/build/neovim.git/lua_autocmd/",
+    stopOnEntry = false,
+    runInTerminal = false,
+  },
 }
 
 --  https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation#go-using-delve-directly
@@ -317,7 +345,7 @@ require("dap-python").setup("python", {
 
 dap.adapters.lldb = {
   type = "executable",
-  command = "/usr/bin/lldb-vscode-12",
+  command = "/usr/bin/lldb-vscode-11",
   name = "lldb",
 }
 
@@ -391,64 +419,6 @@ dap.adapters.rt_lldb = function(callback, _)
   end)
 end
 
--- function M.setup_adapter()
--- 	local dap = require("dap")
--- 	dap.adapters.rt_lldb = config.options.dap.adapter
--- end
-
-function StartRustServer(args)
-  args = args or {}
-
-  if not pcall(require, "dap") then
-    vim.notify "nvim-dap not found."
-    return
-  end
-
-  if not pcall(require, "plenary.job") then
-    vim.notify "plenary not found."
-    return
-  end
-
-  local Job = require "plenary.job"
-
-  -- local cargo_args = get_cargo_args_from_runnables_args(args)
-
-  vim.notify "Compiling a debug build for debugging. This might take some time..."
-
-  Job
-    :new({
-      command = "cargo",
-      args = { "build", "--message-format=json" },
-      cwd = nil,
-      on_exit = function(j, code)
-        if code and code > 0 then
-          vim.notify "An error occured while compiling. Please fix all compilation issues and try again."
-        end
-        vim.schedule(function()
-          for _, value in pairs(j:result()) do
-            local json = vim.fn.json_decode(value)
-            if type(json) == "table" and json.executable ~= vim.NIL and json.executable ~= nil then
-              local dap_config = {
-                name = "Rust tools debug",
-                type = "rt_lldb",
-                request = "launch",
-                program = json.executable,
-                args = args.executableArgs or { "lsif", "/home/tjdevries/build/rmpv/" },
-                cwd = args.workspaceRoot,
-                stopOnEntry = false,
-                runInTerminal = false,
-              }
-              dap.run(dap_config)
-
-              break
-            end
-          end
-        end)
-      end,
-    })
-    :start()
-end
-
 dap.configurations.rust = {
   {
     name = "Launch",
@@ -485,6 +455,15 @@ dap.configurations.rust = {
   },
 }
 
+vim.keymap.set("n", "<leader><F5>", function()
+  if vim.bo.filetype ~= "rust" then
+    vim.notify "This wasn't rust. I don't know what to do"
+    return
+  end
+
+  R("tj.dap").select_rust_runnable()
+end)
+
 vim.cmd [[nnoremap <silent> <F5> :lua require'dap'.continue()<CR>]]
 vim.cmd [[nnoremap <silent> <F1> :lua require'dap'.step_into()<CR>]]
 vim.cmd [[nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>]]

xdg_config/nvim/lua/tj/dap.lua

@@ -0,0 +1,143 @@
+local Job = require "plenary.job"
+local dap = require "dap"
+
+local M = {}
+
+--[[
+|| {
+||   args = {
+||     cargoArgs = { "test", "--package", "dap-tester", "--bin", "dap-tester" },
+||     cargoExtraArgs = {},
+||     executableArgs = { "test::can_i_debug_this", "--exact", "--nocapture" },
+||     workspaceRoot = "/home/tjdevries/tmp/dap-tester"
+||   },
+||   kind = "cargo",
+||   label = "test test::can_i_debug_this",
+||   location = {
+||     targetRange = {
+||       end = {
+||         character = 5,
+||         line = 22
+||       },
+||       start = {
+||         character = 4,
+||         line = 14
+||       }
+||     },
+||     targetSelectionRange = {
+||       end = {
+||         character = 23,
+||         line = 15
+||       },
+||       start = {
+||         character = 7,
+||         line = 15
+||       }
+||     },
+||     targetUri = "file:///home/tjdevries/tmp/dap-tester/src/main.rs"
+||   }
+|| }
+--]]
+
+local get_cargo_args = function(args)
+  local result = {}
+
+  assert(args.cargoArgs, vim.inspect(args))
+  for idx, a in ipairs(args.cargoArgs) do
+    table.insert(result, a)
+    if idx == 1 and a == "test" then
+      -- Don't run tests, just build
+      table.insert(result, "--no-run")
+    end
+  end
+
+  table.insert(result, "--message-format=json")
+
+  -- TODO: handle cargoExtraArgs
+
+  return result
+end
+
+M.select_rust_related = function(bufnr, win)
+  bufnr = bufnr or vim.api.nvim_get_current_buf()
+  win = win or vim.api.nvim_get_current_win()
+
+  vim.lsp.buf_request(bufnr, "rust-analyzer/relatedTests", vim.lsp.util.make_position_params(win), function(err, result)
+    local runnables = {}
+    for _, v in ipairs(result) do
+      table.insert(runnables, v.runnable)
+    end
+
+    vim.ui.select(runnables, {
+      prompt = "Related Rust Runnables",
+      format_item = function(item)
+        return item.label
+      end,
+    }, function(item)
+      M.debug_rust_runnable(item)
+    end)
+  end)
+end
+
+M.select_rust_runnable = function(bufnr)
+  bufnr = bufnr or vim.api.nvim_get_current_buf()
+
+  vim.lsp.buf_request(
+    bufnr,
+    "experimental/runnables",
+    { textDocument = vim.lsp.util.make_text_document_params(bufnr) },
+    function(_, result)
+      vim.ui.select(result, {
+        prompt = "Rust Runnables",
+        format_item = function(item)
+          return item.label
+        end,
+      }, function(item)
+        M.debug_rust_runnable(item)
+      end)
+    end
+  )
+end
+
+M.debug_rust_runnable = function(item)
+  item = item or {}
+  item = vim.deepcopy(item)
+
+  vim.notify("Debugging: " .. item.label)
+
+  Job
+    :new({
+      command = "cargo",
+      args = get_cargo_args(item.args),
+      cwd = item.args.workspaceRoot,
+      on_exit = function(j, code)
+        if code and code > 0 then
+          vim.notify "An error occured while compiling. Please fix all compilation issues and try again."
+        end
+
+        vim.schedule(function()
+          for _, value in pairs(j:result()) do
+            local json = vim.fn.json_decode(value)
+            if type(json) == "table" and json.executable ~= vim.NIL and json.executable ~= nil then
+              local dap_config = {
+                name = "Rust tools debug",
+                type = "rt_lldb",
+                request = "launch",
+                program = json.executable,
+                args = item.args.executableArgs,
+                cwd = item.workspaceRoot,
+                stopOnEntry = false,
+                runInTerminal = false,
+              }
+
+              dap.run(dap_config)
+              break
+            end
+          end
+        end)
+      end,
+    })
+    :start()
+end
+
+return M

xdg_config/nvim/lua/tj/lsp/init.lua

@@ -108,7 +108,7 @@ local custom_attach = function(client)
     ]]
   end
 
-  if client.resolved_capabilities.code_lens and false then
+  if client.resolved_capabilities.code_lens then
     vim.cmd [[
       augroup lsp_document_codelens
         au! * <buffer>

xdg_config/nvim/lua/tj/telescope/custom/multi_rg.lua

@@ -11,11 +11,13 @@ local flatten = vim.tbl_flatten
 return function(opts)
   opts = opts or {}
   opts.cwd = opts.cwd and vim.fn.expand(opts.cwd) or vim.loop.cwd()
-  opts.shortcuts = opts.shortcuts or {
-    ["l"] = "*.lua",
-    ["v"] = "*.vim",
-    ["n"] = "*.{vim,lua}",
-  }
+  opts.shortcuts = opts.shortcuts
+    or {
+      ["l"] = "*.lua",
+      ["v"] = "*.vim",
+      ["n"] = "*.{vim,lua}",
+      ["c"] = "*.c",
+    }
   opts.pattern = opts.pattern or "%s"
 
   local custom_grep = finders.new_async_job {