updates for chat :)

Author: tjdevries

xdg_config/nvim/after/plugin/dap.lua

@@ -178,7 +178,7 @@ dap.configurations.c = {
     "executable": "<path to the elf/exe file relativ to workspace root in order to load the symbols>",
     "target": "X.X.X.X:9999",
     "remote": true,
-    "cwd": "${workspaceRoot}", 
+    "cwd": "${workspaceRoot}",
     "gdbpath": "path/to/your/gdb",
     "autorun": [
             "any gdb commands to initiate your environment, if it is needed"
@@ -525,25 +525,45 @@ augroup END
 local dap_ui = require "dapui"
 
 local _ = dap_ui.setup {
-  -- You can change the order of elements in the sidebar
-  sidebar = {
-    elements = {
-      -- Provide as ID strings or tables with "id" and "size" keys
-      {
-        id = "scopes",
-        size = 0.75, -- Can be float or integer > 1
+  layouts = {
+    {
+      elements = {
+        "scopes",
+        "breakpoints",
+        "stacks",
+        "watches",
       },
-      { id = "watches", size = 00.25 },
+      size = 40,
+      position = "left",
+    },
+    {
+      elements = {
+        "repl",
+        "console",
+      },
+      size = 10,
+      position = "bottom",
     },
-    size = 50,
-    position = "left", -- Can be "left" or "right"
-  },
-
-  tray = {
-    elements = {},
-    size = 15,
-    position = "bottom", -- Can be "bottom" or "top"
   },
+  -- -- You can change the order of elements in the sidebar
+  -- sidebar = {
+  --   elements = {
+  --     -- Provide as ID strings or tables with "id" and "size" keys
+  --     {
+  --       id = "scopes",
+  --       size = 0.75, -- Can be float or integer > 1
+  --     },
+  --     { id = "watches", size = 00.25 },
+  --   },
+  --   size = 50,
+  --   position = "left", -- Can be "left" or "right"
+  -- },
+  --
+  -- tray = {
+  --   elements = {},
+  --   size = 15,
+  --   position = "bottom", -- Can be "bottom" or "top"
+  -- },
 }
 
 local original = {}

xdg_config/nvim/after/plugin/diagnostic.lua

@@ -15,8 +15,19 @@ vim.diagnostic.config {
     -- border = "rounded",
     -- source = "always",
     format = function(d)
+      if not d.code and not d.user_data then
+        return d.message
+      end
+
       local t = vim.deepcopy(d)
-      local code = d.code or d.user_data.lsp.code
+      local code = d.code
+      if not code then
+        if not d.user_data.lsp then
+          return d.message
+        end
+
+        code = d.user_data.lsp.code
+      end
       if code then
         t.message = string.format("%s [%s]", t.message, code):gsub("1. ", "")
       end
@@ -29,22 +40,43 @@ vim.diagnostic.config {
   update_in_insert = false,
 }
 
-local goto_opts = {
-  wrap = true,
-  float = true,
+-- Go to the next diagnostic, but prefer going to errors first
+-- In general, I pretty much never want to go to the next hint
+local severity_levels = {
+  vim.diagnostic.severity.ERROR,
+  vim.diagnostic.severity.WARN,
+  vim.diagnostic.severity.INFO,
+  vim.diagnostic.severity.HINT,
 }
 
+local get_highest_error_severity = function()
+  for _, level in ipairs(severity_levels) do
+    local diags = vim.diagnostic.get(0, { severity = { min = level } })
+    if #diags > 0 then
+      return level, diags
+    end
+  end
+end
+
 nmap {
   "<space>dn",
   function()
-    vim.diagnostic.goto_next(goto_opts)
+    vim.diagnostic.goto_next {
+      severity = get_highest_error_severity(),
+      wrap = true,
+      float = true,
+    }
   end,
 }
 
 nmap {
   "<space>dp",
   function()
-    vim.diagnostic.goto_prev(goto_opts)
+    vim.diagnostic.goto_prev {
+      severity = get_highest_error_severity(),
+      wrap = true,
+      float = true,
+    }
   end,
 }
 

xdg_config/nvim/after/plugin/luasnip.lua

@@ -24,7 +24,7 @@ ls.config.set_config {
   ext_opts = {
     [types.choiceNode] = {
       active = {
-        virt_text = { { " <- Current Choice", "NonTest" } },
+        virt_text = { { " « ", "NonTest" } },
       },
     },
   },

xdg_config/nvim/after/plugin/sourcegraph.lua

@@ -6,3 +6,7 @@ local dbs = vim.g.dbs
 dbs["sg-local"] = "postgres://sourcegraph:sourcegraph@localhost:5432/sourcegraph"
 
 vim.g.dbs = dbs
+
+require("sg").setup {
+  on_attach = require("tj.lsp").on_attach,
+}

xdg_config/nvim/after/plugin/sql_rust_automagic.lua

@@ -0,0 +1,78 @@
+local query = vim.treesitter.parse_query(
+  "rust",
+  [[
+(
+ (macro_invocation
+  (scoped_identifier
+     path: (identifier) @_path
+     name: (identifier) @_identifier)
+
+  (token_tree (raw_string_literal) @raw))
+
+ (#eq? @_path "sqlx")
+ (#eq? @_identifier "query")
+ (#offset! @raw 1 0 -1 0)
+)
+]]
+)
+
+local Job = require "plenary.job"
+
+local format_dat_sql = function(bufnr)
+  if not bufnr then
+    bufnr = vim.api.nvim_get_current_buf()
+  end
+
+  if vim.bo[bufnr].filetype ~= "rust" then
+    vim.notify "can only be used in rust"
+    return
+  end
+
+  local parser = vim.treesitter.get_parser(bufnr, "rust", {})
+  local tree = parser:parse()[1]
+
+  -- Finds sql-format-via-python somewhere in your nvim config path
+  local bin = vim.api.nvim_get_runtime_file("bin/sql-format-via-python.py", false)[1]
+
+  local changes = {}
+  for id, node, metadata in query:iter_captures(tree:root(), bufnr, 0, -1) do
+    if id == 3 then
+      local text = vim.treesitter.get_node_text(node, bufnr)
+      local split = vim.split(text, "\n")
+      local result = table.concat(vim.list_slice(split, 2, #split - 1), "\n")
+
+      local j = Job:new {
+        command = "python",
+        args = { bin },
+        writer = { result },
+      }
+
+      local range = { node:range() }
+
+      local formatted = j:sync()
+      local rep = string.rep(" ", range[2])
+      for idx, line in ipairs(formatted) do
+        formatted[idx] = rep .. line
+      end
+
+      table.insert(changes, 1, { start = range[1] + 1, final = range[3], formatted = formatted })
+    end
+  end
+
+  for _, change in ipairs(changes) do
+    vim.api.nvim_buf_set_lines(bufnr, change.start, change.final, false, change.formatted)
+  end
+end
+
+vim.api.nvim_create_user_command("SqlMagic", function()
+  format_dat_sql()
+end, {})
+
+local group = vim.api.nvim_create_augroup("rust-sql-magic", { clear = true })
+vim.api.nvim_create_autocmd("BufWritePre", {
+  group = group,
+  pattern = "*.rs",
+  callback = function()
+    format_dat_sql()
+  end,
+})

xdg_config/nvim/after/plugin/statusline.lua

@@ -10,6 +10,23 @@ require("el").reset_windows()
 
 vim.opt.laststatus = 3
 
+if false then
+  -- Disappearing statusline for commands
+  vim.opt.cmdheight = 0
+  vim.api.nvim_create_autocmd("ModeChanged", {
+    group = vim.api.nvim_create_augroup("StatusDisappear", { clear = true }),
+    callback = function()
+      if vim.v.event.new_mode == "c" then
+        vim.opt.laststatus = 0
+      elseif vim.v.event.old_mode == "c" then
+        vim.opt.laststatus = 3
+      end
+
+      pcall(vim.cmd, [[silent! redraw]])
+    end,
+  })
+end
+
 local builtin = require "el.builtin"
 local extensions = require "el.extensions"
 local sections = require "el.sections"

xdg_config/nvim/after/plugin/treesitter.lua

@@ -29,7 +29,7 @@ list.rsx = {
 
 -- :h nvim-treesitter-query-extensions
 local custom_captures = {
-  ["function.call"] = "LuaFunctionCall",
+  ["function.call.lua"] = "LuaFunctionCall",
   ["function.bracket"] = "Type",
   ["namespace.type"] = "TSNamespaceType",
 }

xdg_config/nvim/bin/sql-format-via-python.py

@@ -0,0 +1,29 @@
+import sys
+import sqlparse
+
+
+# TODO: Decide what to do about $/?
+# contents = contents.replace(f"${identifier}", f"__id_{identifier}")
+
+contents = sys.stdin.read()
+for identifier in range(10):
+    contents = contents.replace(f"?{identifier}", f"__id_{identifier}")
+
+# for nightshadedude
+comma_first = True
+
+result = sqlparse.format(contents
+                         , indent_columns=True
+                         , keyword_case='upper'
+                         , identifier_case='lower'
+                         , reindent=True
+                         , output_format='sql'
+                         , indent_after_first=True
+                         , wrap_after=80
+                         , comma_first=comma_first
+                         )
+
+for identifier in range(10):
+    result = result.replace(f"__id_{identifier}", f"?{identifier}")
+
+print(result.strip())

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

@@ -72,10 +72,8 @@ local filetype_attach = setmetatable({
   end,
 
   typescript = function()
-    autocmd_format(false, function(clients)
-      return vim.tbl_filter(function(client)
-        return client.name ~= "tsserver"
-      end, clients)
+    autocmd_format(false, function(client)
+      return client.name ~= "tsserver"
     end)
   end,
 }, {
@@ -144,7 +142,7 @@ local custom_attach = function(client)
     ]]
   end
 
-  if client.server_capabilities.codeLensProvider then
+  if false and client.server_capabilities.codeLensProvider then
     if filetype ~= "elm" then
       vim.cmd [[
         augroup lsp_document_codelens
@@ -173,13 +171,17 @@ updated_capabilities.textDocument.completion.completionItem.insertReplaceSupport
 -- vim.lsp.buf_request(0, "textDocument/codeLens", { textDocument = vim.lsp.util.make_text_document_params() })
 
 local servers = {
+
+  -- Also uses `shellcheck` and `explainshell`
+  bashls = true,
+
+  eslint = true,
   gdscript = true,
-  graphql = true,
+  -- graphql = true,
   html = true,
   pyright = true,
   vimls = true,
   yamlls = true,
-  eslint = true,
 
   cmake = (1 == vim.fn.executable "cmake-language-server"),
   dartls = pcall(require, "flutter-tools"),
@@ -200,18 +202,18 @@ local servers = {
   },
 
   gopls = {
-    root_dir = function(fname)
-      local Path = require "plenary.path"
-
-      local absolute_cwd = Path:new(vim.loop.cwd()):absolute()
-      local absolute_fname = Path:new(fname):absolute()
-
-      if string.find(absolute_cwd, "/cmd/", 1, true) and string.find(absolute_fname, absolute_cwd, 1, true) then
-        return absolute_cwd
-      end
-
-      return lspconfig_util.root_pattern("go.mod", ".git")(fname)
-    end,
+    -- root_dir = function(fname)
+    --   local Path = require "plenary.path"
+    --
+    --   local absolute_cwd = Path:new(vim.loop.cwd()):absolute()
+    --   local absolute_fname = Path:new(fname):absolute()
+    --
+    --   if string.find(absolute_cwd, "/cmd/", 1, true) and string.find(absolute_fname, absolute_cwd, 1, true) then
+    --     return absolute_cwd
+    --   end
+    --
+    --   return lspconfig_util.root_pattern("go.mod", ".git")(fname)
+    -- end,
 
     settings = {
       gopls = {
@@ -230,11 +232,11 @@ local servers = {
 
   rust_analyzer = {
     cmd = { "rustup", "run", "nightly", "rust-analyzer" },
+    -- cmd = { "rust-analyzer" },
   },
 
   elmls = true,
   cssls = true,
-
   tsserver = {
     init_options = ts_util.init_options,
     cmd = { "typescript-language-server", "--stdio" },
@@ -369,13 +371,6 @@ for server, config in pairs(servers) do
   setup_server(server, config)
 end
 
-if pcall(require, "sg.lsp") then
-  require("sg.lsp").setup {
-    on_init = custom_init,
-    on_attach = custom_attach,
-  }
-end
-
 --[ An example of using functions...
 -- 0. nil -> do default (could be enabled or disabled)
 -- 1. false -> disable it