add lsp document symbols telescope keybind

It just doesn't make sense, why would you choose to use tabs when you
really get nothing out of them. I've heard arguments that everyone get's
what they want in terms of formatting, but that doesn't really feel
accurate because now I've got code looking messy depending on where it
is you're looking at it on which really sucks. I'm going back to two
space indentation and if a project really wants to use something else
they can setup a formatter and/or .editorconfig file. If you read this
rant, respectfully, what are you doing with your time.

after/ftplugin/java.lua

@@ -1,3 +1,4 @@
+-- TODO: find out why this doesn't work when java isn't the first filetype I open
 local map, auto = core.misc.map, core.misc.auto
 
 local ok, jdtls = pcall(require, "jdtls")
@@ -12,7 +13,7 @@ local java_dap_install = core.mason.get_pkg_path("java-debug-adapter")
 -- make sure to check if things with 💀 need updating
 local config = {
   cmd = {
-    "java", -- 💀
+    "/usr/lib/jvm/openjdk21/bin/java", -- 💀
     "-jar",
     vim.fn.glob(vim.fs.joinpath(jdtls_install, "plugins/org.eclipse.equinox.launcher_*.jar")),
     "-configuration", jdtls_install.."config_linux",

after/lsp/basedpyright.lua

@@ -0,0 +1,17 @@
+return {
+  settings = {
+    python = {
+      pythonPath = "python"
+    },
+    basedpyright = {
+      reportAny = false,
+      analysis = {
+        autoSearchPaths = true,
+        diagnosticMode = "workspace",
+        inlayHints = {
+          callArgumentNames = true
+        }
+      }
+    }
+  }
+}

lua/conf/autos.lua

@@ -30,4 +30,12 @@ auto("BufWritePre", {
   end
 })
 
+-- FIXME: disable for now until I can do more work and make it work better
+-- auto({ "BufEnter", "CursorMoved", "CursorMovedI" }, {
+-- 	group = bufcheck,
+-- 	callback = function()
+-- 		core.color.todo_comments()
+-- 	end
+-- })
+
 core.color.setup_termbg_sync()

lua/conf/binds.lua

@@ -42,14 +42,25 @@ map("i", "<C-n>", function()
 		end
 	end
 end, { desc = "Trigger/select next completion" })
+map("i", "<CR>", function()
+	if vim.fn.pumvisible() ~= 0 then
+		feedkeys("<C-e><CR>")
+	else
+		feedkeys("<CR>")
+	end
+end, { desc = "prevent omnifunc from completing on <CR>" })
 map("i", "<C-s>", "<C-x><C-s>", { desc = "Trigger spell completion" })
 map("n", "<C-s>", lz "<cmd>se spell<CR>ea<C-x><C-s><cmd>se nospell<CR>", { desc = "Trigger spell completion" })
 
 -- quickfix
-map("n", "<M-j>", "<cmd>cnext<CR>", { desc = "qf next" })
-map("n", "<M-k>", "<cmd>cprev<CR>", { desc = "qf prev" })
+map("n", "<M-j>", lz "<cmd>cnext<CR>zz", { desc = "qf next" })
+map("n", "<M-k>", lz "<cmd>cprev<CR>zz", { desc = "qf prev" })
 map("n", "<M-c>", "<cmd>cclose<CR>", { desc = "qf close" })
-map("n", "<M-x>", "<cmd>cope<CR>", { desc = "qf open" })
+map("n", "<M-x>", lz(function()
+	local win = vim.api.nvim_get_current_win()
+	vim.cmd.cope()
+	vim.api.nvim_set_current_win(win)
+end), { desc = "qf open" })
 
 -- man pages
 map("n", "<C-k>", "<cmd>Man<CR>")

lua/conf/opts.lua

@@ -12,6 +12,7 @@ vim.o.cc = "80"
 
 -- indents + tabs
 local tabwidth = 2
+vim.o.et = true
 vim.o.ts = tabwidth
 vim.o.sw = tabwidth
 vim.o.sts = -1
@@ -29,15 +30,18 @@ vim.o.udf = true
 -- searching
 vim.o.ic = true
 
--- make windows look nice
-vim.o.winborder = "solid"
+-- make windows look nice wrapped in pcall cause it's causing my setup to go
+-- bezerk inside of git commit buffers
+pcall(function() vim.o.winborder = '▄,▄,▄,█,▀,▀,▀,█' end)
 
 -- wild menus
 vim.o.ph = 20
 vim.o.wic = true
-vim.o.wop = "fuzzy,pum,tagfile"
+vim.o.wop = "fuzzy,pum"
+vim.o.wim = "noselect:lastused,full"
 
 -- completion
+vim.o.cpt = ".,w,b,u,d,i"
 vim.o.cot = "menu,menuone,noinsert,fuzzy,popup"
 vim.o.cia = "kind,abbr,menu"
 -- waiting for https://github.com/neovim/neovim/pull/25541 to land
@@ -77,7 +81,7 @@ do -- statusline
       "%r", -- readonly flag
       "%=", -- seperate left and right side
 
-      -- print out the number of lsp clients attached with nice colors :)
+      -- print out the number of lsp clients attached
       "λ"..#vim.lsp.get_clients({ bufnr = 0 }), " ",
 
       "%<", -- we can start truncating here (I want to keep the file name)

lua/conf/plugins/lsp.lua

@@ -1,5 +1,3 @@
-local nonels_augroup = core.misc.augroup("nullls formatting")
-
 return {
   { "neovim/nvim-lspconfig",
     reqs = {
@@ -16,7 +14,6 @@ return {
           "jdtls",
           "lua_ls",
           "basedpyright",
-          "black",
           "debugpy"
         }
       }
@@ -41,33 +38,4 @@ return {
   { "mfussenegger/nvim-jdtls",
     reqs = "mfussenegger/nvim-dap"
   },
-
-  { "nvimtools/none-ls.nvim",
-    lazy = dep_short.ft("python"),
-    load = function()
-      local null_ls = require("null-ls")
-
-      null_ls.setup {
-        sources = {
-          null_ls.builtins.formatting.black,
-        },
-
-        on_attach = function(client, bufnr)
-          if client.supports_method("textDocument/formatting") then
-            vim.api.nvim_clear_autocmds({
-              group = nonels_augroup,
-              buffer = bufnr
-            })
-            core.misc.auto("BufWritePre", {
-              group = nonels_augroup,
-              buffer = bufnr,
-              callback = function()
-                vim.lsp.buf.format({ bufnr = bufnr })
-              end
-            })
-          end
-        end
-      }
-    end
-  }
 }

lua/conf/plugins/mellow.lua

@@ -18,7 +18,7 @@ return { "mellow-theme/mellow.nvim",
 
         -- make floats darker
         ["NormalFloat"] = { fg = c.fg, bg = "#111111" },
-        ["FloatBorder"] = { link = "NormalFloat" },
+        ["FloatBorder"] = { fg = "#111111" },
 
 				-- Make pmenu look good
 				["Pmenu"] = { link = "NormalFloat" },
@@ -39,12 +39,23 @@ return { "mellow-theme/mellow.nvim",
         -- telescope styling so I can see when coding outside (real)
         ["TelescopeResultsNormal"] = { bg = c.bg_dark },
         ["TelescopeResultsBorder"] = { link = "TelescopeResultsNormal" },
-        ["TelescopeResultsTitle"] = {
-          bg = core.color.copyhl("TelescopeResultsNormal").background,
-          fg = core.color.copyhl("TelescopeResultsNormal").background
-        },
+        ["TelescopeResultsTitle"] = { bg = c.bg, fg = c.bg },
         ["TelescopePreviewNormal"] = { link = "NormalFloat" },
-        ["TelescopePreviewBorder"] = { link = "TelescopePreviewNormal" }
+        ["TelescopePreviewBorder"] = { link = "TelescopePreviewNormal" },
+
+				-- add highlight groups for my todo highlighting
+				["TodoTODO"] = { link = "DiagnosticHint" },
+				["TodoTODOBG"] = { fg = c.bg, bg = c.cyan, bold = true },
+				["TodoTODOSIGN"] = { fg = c.cyan, bg = c.cyan, bold = true },
+				["TodoBUG"] = { link = "DiagnosticError" },
+				["TodoBUGBG"] = { fg = c.bg, bg = c.red, bold = true },
+				["TodoBUGSIGN"] = { fg = c.red, bg = c.red, bold = true },
+				["TodoTEST"] = { link = "DiagnosticInfo" },
+				["TodoTESTBG"] = { fg = c.bg, bg = c.blue, bold = true },
+				["TodoTESTSIGN"] = { fg = c.blue, bg = c.blue, bold = true },
+				["TodoWARN"] = { link = "DiagnosticWarn" },
+				["TodoWARNBG"] = { fg = c.bg, bg = c.yellow, bold = true },
+				["TodoWARNSIGN"] = { fg = c.yellow, bg = c.yellow, bold = true },
       }
     end
   end

lua/conf/plugins/oil.lua

@@ -1,12 +1,5 @@
 local map = core.misc.map
 
-local permission_hlgroups = {
-  ["-"] = "NonText",
-  ["r"] = "DiagnosticSignWarn",
-  ["w"] = "DiagnosticSignHint",
-  ["x"] = "DiagnosticSignOk",
-}
-
 return { "stevearc/oil.nvim",
   lazy = dep_short.keymap("n", "-"),
   load = function()
@@ -20,7 +13,12 @@ return { "stevearc/oil.nvim",
             local hls = {}
             for i = 1, #permission_str do
               local char = permission_str:sub(i, i)
-              table.insert(hls, { permission_hlgroups[char], i - 1, i })
+              table.insert(hls, { ({
+								["-"] = "NonText",
+								["r"] = "DiagnosticSignWarn",
+								["w"] = "DiagnosticSignHint",
+								["x"] = "DiagnosticSignOk"
+							})[char], i - 1, i })
             end
             return hls
           end,
@@ -29,10 +27,10 @@ return { "stevearc/oil.nvim",
       },
 
 			-- fix the damn border
-			confirmation = { border = vim.o.winborder },
-			progress = { border = vim.o.winborder },
-			ssh = { border = vim.o.winborder },
-			keymaps_help = { border = vim.o.winborder }
+			confirmation = { winborder = vim.o.winborder },
+			progress = { winborder = vim.o.winborder },
+			ssh = { winborder = vim.o.winborder },
+			keymaps_help = { winborder = vim.o.winborder }
 		}
 
     map("n", "-", "<cmd>Oil<CR>")

lua/conf/plugins/telescope.lua

@@ -36,6 +36,7 @@ return { "nvim-telescope/telescope.nvim",
     load:keymap("n", "<leader>f")
     load:keymap("n", "<leader>s")
     load:keymap("n", "<leader>i")
+    load:keymap("n", "<leader>;")
     load:keymap("n", "<leader>tc")
     load:keymap("n", "<leader>tp")
   end,
@@ -141,6 +142,7 @@ return { "nvim-telescope/telescope.nvim",
       desc = "Find strings."
     })
     map("n", "<leader>i", telebuilt.help_tags, { desc = "find help tags." })
+    map("n", "<leader>;", telebuilt.lsp_document_symbols, { desc = "find doc symbols." })
 
     -- find over specific directories
     map("n", "<leader>tc", function()

lua/core/color.lua

@@ -6,19 +6,19 @@ local M = {}
 ---@return table
 function M.copyhl(hlgroup, namespace)
   namespace = namespace or 0
-  local res = {}
+  local res = {
+		["foreground"] = "#ff0000",
+		["background"] = "#ff0000",
+		["special"] = "#ff0000"
+	}
 
   local ok, hl = pcall(vim.api.nvim_get_hl, namespace, {
     name = hlgroup,
     create = false
   })
   if not ok then
-    -- return default
-    return {
-      ["foreground"] = "#000000",
-      ["background"] = "#000000",
-      ["special"] = "#000000"
-    }
+    -- return error colors
+    return res
   end
 
   for _, key in pairs({ "foreground", "background", "special" }) do
@@ -29,6 +29,136 @@ function M.copyhl(hlgroup, namespace)
   return res
 end
 
+local todo_comments_conf = {
+	TODO = {
+		-- TODO:
+		-- NOTE:
+		-- INFO:
+		"TODO", "NOTE", "INFO",
+		hlgroup = "TodoTODO"
+	},
+	BUG = {
+		-- BUG:
+		-- FIXME:
+		"BUG", "FIXME",
+		hlgroup = "TodoBUG"
+	},
+	TEST = {
+		-- TEST:
+		-- PERF:
+		"TEST", "PERF",
+		hlgroup = "TodoTEST"
+	},
+	WARN = {
+		-- WARN:
+		-- HACK:
+		"WARN", "HACK",
+		hlgroup = "TodoWARN"
+	}
+}
+
+local todo_hl_ns = vim.api.nvim_create_namespace("todo_highlights")
+
+--- highlight todo comments in the current buffer.
+--- No I won't use folke's super bloated plugin.
+---
+--- TODO: make this work with coniguious comment blocks like this one.
+--- currently this line won't be highlighted, but I'd like it to be
+---
+--- TEST: We could make this a plugin called ts-todo-hl or smthn like that, but
+--- I'd be willing to bet no one would use it cause everyone loves folke too
+--- much
+function M.todo_comments()
+	local bufnr = vim.api.nvim_win_get_buf(0)
+	local ok, parser = pcall(vim.treesitter.get_parser, bufnr)
+	if not ok or not parser then
+		return
+	end
+
+	-- Construct the query for comments.
+	-- We're using treesitter so that I don't have to use external tooling.
+	local ok, comment_query = pcall(vim.treesitter.query.parse,
+		parser:lang(),
+		"(comment) @comment"
+	)
+	if not ok then
+		return
+	end
+
+	parser:parse(false, function(err, trees)
+		if err then
+			return
+		end
+
+		local root = trees[1]:root()
+		for _, match in comment_query:iter_matches(root, bufnr, 0, -1) do
+			for _, nodes in pairs(match) do
+				for _, node in ipairs(nodes) do
+					if not node or node:type() ~= "comment" then
+						goto continue
+					end
+					local text = vim.treesitter.get_node_text(node, bufnr)
+					-- TODO: instead of doing everything relative to the node we at this
+					-- point should obtain the node start and use a for loop to iterate
+					-- over the lines until we're no longer in a comment. This should
+					-- make dealing with comment blocks easier, and working with these
+					-- multiline comments easier.
+					for _, type in pairs(todo_comments_conf) do
+						for _, v in ipairs(type) do
+							local s, e = string.find(text, v..":")
+							if not s or not e then
+								s, e = string.find(text, v.."%b():")
+							end
+							if s and e then
+								local s_row, s_col = node:start()
+								local e_row, e_col = node:end_()
+
+								-- ensure that our string indicies are relative to the line
+								s = s + s_col
+								e = e + s_col
+
+								ok, err = pcall(vim.api.nvim_buf_set_extmark, bufnr, todo_hl_ns, s_row, e, {
+									hl_mode = "replace",
+									hl_group = type.hlgroup,
+									end_col = e_col,
+									end_row = e_row
+								})
+								if not ok then
+									print("fg", s_row, e, e_col, e_row)
+									print("fg", err)
+								end
+
+								ok, err = pcall(vim.api.nvim_buf_set_extmark, bufnr, todo_hl_ns, s_row, s - 2, {
+									hl_mode = "replace",
+									hl_group = type.hlgroup.."BG",
+									end_col = e - 1,
+									end_row = s_row
+								})
+								if not ok then
+									print("bg", s_row, s - 2, e - 1, s_row)
+									print("bg", err)
+								end
+
+								ok, err = pcall(vim.api.nvim_buf_set_extmark, bufnr, todo_hl_ns, s_row, e - 1, {
+									hl_mode = "replace",
+									hl_group = type.hlgroup.."SIGN",
+									end_col = e,
+									end_row = s_row
+								})
+								if not ok then
+									print("sn", s_row, e - 1, e, s_row)
+									print("sn", err)
+								end
+							end
+						end
+					end
+					::continue::
+				end
+			end
+		end
+	end)
+end
+
 -- Source: 'runtime/lua/vim/_defaults.lua' in Neovim source
 local function parse_osc11(x)
   local r, g, b = x:match('^\027%]11;rgb:(%x+)/(%x+)/(%x+)$')

lua/core/init.lua

@@ -35,45 +35,6 @@ local M = {
 }
 
 M.mason = {
-	packages = {
-		formatters = { "black" },
-		daps = { "debugpy" },
-		lsps = {
-			"clangd",
-			"mesonlsp",
-			"bashls",
-			"lua_ls",
-			"jdtls",
-			"basedpyright"
-		}
-	},
-
-	--- Attempt to install all desired packages. This only really works on first
-	--- install as mason seems to not remove the paths of the things we uninstall
-	--- and instead just removes the code, leaving behind it's metadata.
-	ensure_installed = function()
-		local to_install = {}
-
-		for _, type in pairs(M.mason.packages) do
-			for _, pkg in ipairs(type) do
-				-- HACK: some servers don't have the same name in mason as they do in
-				-- the vim lsp, we use the vim lsp names, and therefore need to
-				-- convert them in here when they're incorrect for mason
-				if pkg == "bashls" then pkg = "bash-language-server"
-				elseif pkg == "lua_ls" then pkg = "lua-language-server"
-				end
-
-				if vim.fn.isdirectory(M.mason.get_pkg_path(pkg)) == 0 then
-					table.insert(to_install, pkg)
-				end
-			end
-		end
-
-		if #to_install > 0 then
-			vim.cmd.MasonInstall(to_install)
-		end
-	end,
-
   --- Gets a path to a package in the Mason registry.
   --- Prefer this to `get_package`, since the package might not always be
   --- available yet and trigger errors.

lua/core/lsp/binds.lua

@@ -8,6 +8,8 @@ local function on_list(opts)
 
     -- get to the closest reference to the cursor (likely the one gr or gd was
     -- called on)
+		--
+		-- TODO: switch this to use opts.idx?
     local closest, distance = 1, false
     for i, item in ipairs(opts.items) do
       if item.filename and vim.fn.expand("%:p") == item.filename then

lua/core/lsp/completion.lua

@@ -94,6 +94,19 @@ auto("CompleteDonePre", {
 			return
 		end
 
+		-- TODO: we need to truncate the item.label to ensure that we don't
+		-- duplicate any text below is my attempt to start work on it:
+		--
+		-- local cursor = vim.api.nvim_win_get_cursor(0)
+		-- local line = vim.api.nvim_buf_get_lines(
+		-- 	vim.api.nvim_win_get_buf(0),
+		-- 	cursor[1] - 1,
+		-- 	cursor[1],
+		-- 	false
+		-- )[1]
+		-- item.label = string.gsub(item.label, string.sub(line, cursor[2] + 1), "")
+		-- item.insertText = item.label
+
 		-- if the item isn't a snippet then we might want to create a snippet
 		if item.label and item.kind and item.insertTextFormat then
 			if item.insertTextFormat ~= 2 and item.kind == 3 then

lua/core/lsp/init.lua

@@ -2,9 +2,6 @@ local M = {}
 
 --- setup vim lsp options
 function M.setup()
-	-- ensure the severs are setup
-	require("core.lsp.servers")
-
   -- confgiure lsp
   vim.diagnostic.config {
     virtual_lines = {

lua/core/lsp/servers.lua

@@ -1,11 +0,0 @@
-local servers = require("core").mason.packages.lsps
-
--- enable the servers I want
-for _, server in ipairs(servers) do
-	-- skip jdtls, we start this on our own
-	if servers == "jdtls" then
-		goto continue
-	end
-	vim.lsp.enable(server)
-	::continue::
-end

lua/core/lsp/wtf.lua

@@ -16,14 +16,22 @@ auto('LspAttach', {
 		-- highlight color codes via lsp (supported by cssls)
 		-- #ff0000
     if client:supports_method('textDocument/documentColor') then
-      vim.lsp.document_color.enable(true, ctx.buf)
+      pcall(vim.lsp.document_color.enable, true, ctx.buf)
     end
 
 		-- enable linked editing this allows lsps to modify things like html tags
 		-- for example when you change <p> to <a> </p> will be changed by the lsp
 		-- to </a>
     if client:supports_method('textDocument/linkedEditingRange') then
-			vim.lsp.linked_editing_range.enable(true, { client_id = client.id })
+			pcall(vim.lsp.linked_editing_range.enable, true, { client_id = client.id })
     end
+
+		-- disabled for now cause I don't like it
+		-- -- enable type formatting which allows lsps to modify text while you're
+		-- -- typing for example if you insert {} in a string in python basedpyright
+		-- -- will change the string to a format string
+		--   if client:supports_method('textDocument/onTypeFormatting') then
+		-- 	pcall(vim.lsp.on_type_formatting.enable, true, { client_id = client.id })
+		-- end
   end
 })

lua/core/misc.lua

@@ -52,11 +52,22 @@ end
 
 --- Make an action lazy. This is mostly useful for keybinds which do a lot and
 --- you want to make sure the screen doesn't flash
----@param txt string the action
----@return string lazified
+---@param txt string|function the action
+---@return string|function lazified
 ---@nodiscard
 function M.lz(txt)
+	if type(txt) == "string" then
 		return "<cmd>se lz<CR>"..txt.."<cmd>se lz!<CR>"
+	elseif type(txt) == "function" then
+		return function()
+			vim.cmd.se("lz")
+			-- gotta make sure we can always unset lz
+			pcall(txt)
+			vim.cmd.se("lz!")
+		end
+	else
+		return txt
+	end
 end
 
 return M