dap arghhh cmp

2023-11-26 12:57:56 -06:00
parent dc0eb7d2ad
commit f054ccd98c
13 changed files with 140 additions and 52 deletions
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@ -1,11 +1,12 @@
 {
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "105b5f7f72c13e682a3aa5d29eac2408ae513b22" },
-  "aerial.nvim": { "branch": "master", "commit": "d82a994d66a9c6c700f240498304bd6d68fb33f0" },
+  "LuaSnip": { "branch": "master", "commit": "df58ee1664cfda71479cd2bbd56114f56599eba6" },
+  "aerial.nvim": { "branch": "master", "commit": "88764566f96bf900a64b3dcd6d178cfb69b1c8ce" },
  "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
  "auto-session": { "branch": "main", "commit": "3eb26b949e1b90798e84926848551046e2eb0721" },
  "bluloco.nvim": { "branch": "main", "commit": "37795f21b48df8c12b478518af53f3dddb9014f7" },
  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
+  "clyde.vim": { "branch": "master", "commit": "368691fe856c09b0d064f34b35c856ddb196b391" },
  "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
@ -21,17 +22,16 @@
  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
  "codeium.nvim": { "branch": "main", "commit": "822e762567a0bf50b1a4e733c8c93691934d7606" },
-  "codeium.vim": { "branch": "main", "commit": "1efe2a2cdf516094bdb211aa8a1d45ef01836207" },
  "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
-  "fidget.nvim": { "branch": "main", "commit": "a1493d94ecb3464ab3ae4d5855765310566dace4" },
+  "debugprint.nvim": { "branch": "main", "commit": "95f0ef6d4f804df8d5790a2cbb91aa78f8f4877d" },
  "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
  "formatter.nvim": { "branch": "master", "commit": "91651e6afaf6f73b0ffb8b433c06cd4e06f90403" },
  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
  "fzf.vim": { "branch": "master", "commit": "1e054c1d075d87903647db9320116d360eb8b024" },
  "git-conflict.nvim": { "branch": "main", "commit": "4e0191c9a0ae05d7fbdcdc7f15cd358f56d23bfb" },
-  "gitsigns.nvim": { "branch": "main", "commit": "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55" },
-  "go.nvim": { "branch": "master", "commit": "e749ff85ffec5a4ef11cb8252a2030be5726cb6c" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5fc573f2d2a49aec74dd6dc977e8b137429d1897" },
+  "go.nvim": { "branch": "master", "commit": "ad5db6a907160e0d78671acf93d0ebfccd2fae30" },
  "guihua.lua": { "branch": "master", "commit": "cd68996069abedffcd677ca7eee3a660b79e5b32" },
  "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
@ -48,30 +48,32 @@
  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
  "lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" },
  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f522b5439bedac0225daf8d2fedb5039b59e83ee" },
  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
  "mini.splitjoin": { "branch": "main", "commit": "2b4ade24c1d46ce98801b74fc84241d7b676f9f4" },
  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
  "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
-  "neoscopes": { "branch": "main", "commit": "d3f92e9360da7b7ab4eb6c5811d5ebaf7135239f" },
-  "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
+  "neodev.nvim": { "branch": "main", "commit": "f972d7e6cd21b691199565cfe3e6487e774a4e8f" },
+  "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
+  "nui.nvim": { "branch": "main", "commit": "401a7c65bfd6433e1b0b48d2c246e2621fc44387" },
  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
  "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
  "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7384e7149e79365c96dc623d9fa3444737776982" },
+  "nvim-lint": { "branch": "master", "commit": "3a7c15331a57ba40a56f00f29173700af853fa03" },
+  "nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" },
  "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" },
  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
  "nvim-surround": { "branch": "main", "commit": "18016d6af52edc9f1c794dcf6665a26a2962d2ee" },
-  "nvim-treesitter": { "branch": "master", "commit": "f2de95e30aac507bf7fa785e13a8edcbdc604605" },
+  "nvim-treesitter": { "branch": "master", "commit": "b056e4227b1c5d3ecfe96941352364c0c10668df" },
  "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4" },
+  "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" },
  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" },
  "oxocarbon.nvim": { "branch": "main", "commit": "b47c0ecab3a4270815afb3b05e03423b04cca8f2" },
-  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" },
  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
  "quickgd.nvim": { "branch": "main", "commit": "470efa730ebaf2e95653b13c22b93d8d60d31e79" },
  "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" },
@ -81,18 +83,19 @@
  "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
  "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
  "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" },
-  "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" },
+  "telescope.nvim": { "branch": "master", "commit": "e4c62dedd760d339bea5b8325c2d918d87476d00" },
+  "tree-sitter-gdscript": { "branch": "master", "commit": "03f20b94707a21bed90bb95101684bc4036139ce" },
  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
  "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
  "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
  "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
  "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
  "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
-  "vim-floaterm": { "branch": "master", "commit": "b1d93789faf8bfe1f3e17eec03b8312c2939fcf2" },
+  "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" },
  "vim-godot": { "branch": "master", "commit": "d748a46be5195256f6b2c767ef32de87b05ae8f7" },
  "vim-imp": { "branch": "main", "commit": "fe9be485854ba602059f0d8af4fa4ab0a74d61ac" },
  "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "vim-matchup": { "branch": "master", "commit": "d30b72d20f01478a8486f15a57c89fe3177373db" },
+  "vim-matchup": { "branch": "master", "commit": "269f9bea87e20a01438085eb13df539929a12727" },
  "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
  "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
  "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
--- a/config/.config/nvim/spell/en.utf-8.add
+++ b/config/.config/nvim/spell/en.utf-8.add
@ -7,3 +7,4 @@ setInstance
 collsion_body
 shake_decay
 index
+func/!
--- a/config/.config/nvim/spell/en.utf-8.add.spl
+++ b/config/.config/nvim/spell/en.utf-8.add.spl
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@ -55,6 +55,7 @@ return {
 	"AndrewRadev/tagalong.vim",
 	"tversteeg/registers.nvim",
 	"jremmen/vim-ripgrep",
+	"viniciusgerevini/clyde.vim",
 	{ "andymass/vim-matchup", event = "VimEnter" },
 	-- Undo tree
 	{
--- a/vim/.vim/lua/plugins/cmp.lua
+++ b/vim/.vim/lua/plugins/cmp.lua
@ -1,7 +1,4 @@
 local use_google = require("utils").use_google
-local tprint = require("utils").tprint
-local dump = require("utils").dump
-local log = require("utils").log

 local function compare_by_ciderlsp_score(entry1, entry2)
 	if entry1.completion_item.score ~= nil and entry2.completion_item.score ~= nil then
@ -18,20 +15,8 @@ end

 return {
 	{
-		"Exafunction/codeium.vim",
-		event = "InsertEnter",
-		cond = not use_google(),
-		dependencies = {
-			"onsails/lspkind.nvim",
 		"hrsh7th/nvim-cmp",
-		},
-		config = function()
-			require("codeium").setup({})
-		end,
-	},
-	{
-		"hrsh7th/nvim-cmp",
-		event = "VimEnter",
+		event = { "InsertEnter", "CmdlineEnter" },
 		dependencies = {
 			"f3fora/cmp-spell",
 			"hrsh7th/cmp-buffer",
@ -39,6 +24,7 @@ return {
 			"hrsh7th/cmp-calc",
 			"onsails/lspkind.nvim",
 			"hrsh7th/cmp-cmdline",
+			"Exafunction/codeium.nvim",
 			"hrsh7th/cmp-emoji",
 			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-nvim-lsp-document-symbol",
@ -149,14 +135,20 @@ return {
 					["<CR>"] = cmp.mapping.confirm({ select = true }),
 					["<Tab>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
-							cmp.select_next_item()
-							-- elseif has_words_before() then
-							--     cmp.complete()
+							if #cmp.get_entries() == 1 then
+								cmp.confirm({ select = true })
 							else
-							fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
+								cmp.select_next_item()
+							end
+						elseif has_words_before() then
+							cmp.complete()
+							if #cmp.get_entries() == 1 then
+								cmp.confirm({ select = true })
+							end
+						else
+							fallback()
 						end
 					end, { "i", "s" }),
-
 					["<S-Tab>"] = cmp.mapping(function()
 						if cmp.visible() then
 							cmp.select_prev_item()
--- a/vim/.vim/lua/plugins/codeium.lua
+++ b/vim/.vim/lua/plugins/codeium.lua
@ -0,0 +1,16 @@
+local use_google = require("utils").use_google
+return {
+	{
+		"Exafunction/codeium.nvim",
+		event = "VeryLazy",
+		-- event = "InsertEnter",
+		cond = not use_google(),
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"hrsh7th/nvim-cmp",
+		},
+		config = function()
+			require("codeium").setup({})
+		end,
+	},
+}
--- a/vim/.vim/lua/plugins/dap.lua
+++ b/vim/.vim/lua/plugins/dap.lua
@ -1,17 +1,20 @@
 return {
 	"mfussenegger/nvim-dap",
 	dependencies = {
+		"rcarriga/nvim-dap-ui",
 		"nvim-telescope/telescope-dap.nvim",
 	},
+	keys = {
+		{ "<leader>do", ":lua require'dapui'.open()<CR>" },
+		-- { "<F5>", ":lua require'dap'.continue()<CR>" },
+		{ "<leader>dl", ":lua require'dap'.run_last()<CR>" },
+		{ "<leader>db", ":lua require'dap'.toggle_breakpoint()<CR>" },
+		{ "<leader>dB", ":lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>" },
+		{ "<leader>dlp", ":lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>" },
+		{ "<leader>dr", ":lua require'dap'.repl.open()<CR>" },
+		{ "<leader>dt", ":Telescope dap configurations<CR>" },
+	},
 	config = function()
-		-- <leader>dl :lua require'dapui'.open()<CR>
-		-- <F5> :lua require'dap'.continue()<CR>
-		-- <leader>dl :lua require'dap'.run_last()<CR>
-		-- <leader>db :lua require'dap'.toggle_breakpoint()<CR>
-		-- <leader>dB :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>
-		-- <leader>dlp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>
-		-- <leader>dr :lua require'dap'.repl.open()<CR>
-		--
 		require("telescope").load_extension("dap")
 		local dap = require("dap")
 		dap.adapters.java = function(callback)
@ -25,14 +28,57 @@ return {
 			})
 		end

+		dap.adapters.godot = {
+			type = "server",
+			host = "127.0.0.1",
+			port = 6006,
+		}
+
 		dap.configurations.java = {
 			{
 				type = "java",
 				request = "attach",
-				name = "Debug (Attach) - Remote",
+				name = "Java - Attach Remote",
 				hostName = "127.0.0.1",
 				port = 5005,
 			},
 		}
+		dap.configurations.gdscript = {
+			{
+				name = "Godot - Launch Project",
+				type = "godot",
+				request = "launch",
+				project = "${workspaceFolder}",
+				additional_options = "",
+			},
+			{
+				name = "Godot - Launch Current File",
+				type = "godot",
+				request = "launch",
+				scene = "current",
+				project = "${workspaceFolder}",
+				additional_options = "",
+			},
+			{
+				name = "Godot - Attach to Godot",
+				type = "godot",
+				request = "attach",
+				address = "127.0.0.1",
+				port = 6007,
+			},
+		}
+
+		local dapui = require("dapui")
+		vim.cmd("set mouse=n")
+		dapui.setup()
+		dap.listeners.after.event_initialized["dapui_config"] = function()
+			dapui.open()
+		end
+		dap.listeners.before.event_terminated["dapui_config"] = function()
+			dapui.close()
+		end
+		dap.listeners.before.event_exited["dapui_config"] = function()
+			dapui.close()
+		end
 	end,
 }
--- a/vim/.vim/lua/plugins/debugprint.lua
+++ b/vim/.vim/lua/plugins/debugprint.lua
@ -0,0 +1,11 @@
+return {
+	"andrewferrier/debugprint.nvim",
+	opts = {},
+	-- Dependency only needed for NeoVim 0.8
+	dependencies = {
+		"nvim-treesitter/nvim-treesitter",
+	},
+	-- Remove the following line to use development versions,
+	-- not just the formal releases
+	version = "*",
+}
--- a/vim/.vim/lua/plugins/formatter.lua
+++ b/vim/.vim/lua/plugins/formatter.lua
@ -56,6 +56,16 @@ return {
 					require("formatter.filetypes.cs").clangformat,
 					-- require("formatter.filetypes.cs").dotnetformat,
 				},
+				gdscript = {
+					function()
+						return {
+							exe = "gdformat",
+							args = {
+								"-l 100",
+							},
+						}
+					end,
+				},
 				xml = {
 					function()
 						return {
--- a/vim/.vim/lua/plugins/lint.lua
+++ b/vim/.vim/lua/plugins/lint.lua
@ -1,6 +1,10 @@
 return {
 	"mfussenegger/nvim-lint",
 	config = function()
+		require("lint").linters_by_ft = {
+			gdscript = { "gdlint" },
+		}
+
 		vim.api.nvim_create_autocmd({ "BufWritePost" }, {
 			callback = function()
 				require("lint").try_lint()
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@ -9,12 +9,7 @@ local deps = {
 	"ray-x/guihua.lua",
 }

-if not use_google() then
-	table.insert(deps, "Exafunction/codeium.nvim")
-end
-
 return {
-	"j-hui/fidget.nvim",
 	{
 		"L3MON4D3/LuaSnip",
 		build = "make install_jsregexp",
--- a/vim/.vim/lua/plugins/neodev.lua
+++ b/vim/.vim/lua/plugins/neodev.lua
@ -0,0 +1,8 @@
+return {
+	"folke/neodev.nvim",
+	config = function()
+		require("neodev").setup({
+			library = { plugins = { "nvim-dap-ui" }, types = true },
+		})
+	end,
+}
--- a/vim/.vim/lua/plugins/nvim-treesitter.lua
+++ b/vim/.vim/lua/plugins/nvim-treesitter.lua
@ -1,4 +1,5 @@
 return {
+	"PrestonKnopp/tree-sitter-gdscript",
 	{
 		"nvim-treesitter/nvim-treesitter-context",
 		config = function()