diff --git a/lazy-lock.json b/lazy-lock.json index e27898a..e8e4491 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,12 +23,11 @@ "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" }, - "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, + "neotest-gtest": { "branch": "main", "commit": "b44c8afc26cea75ffc80617ce07b4e745a56e589" }, "noice.nvim": { "branch": "main", "commit": "8f1d9966762e62fa8788e5fb1a5f6a86784221d9" }, "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, "none-ls.nvim": { "branch": "main", "commit": "f1b438ab1709cf9d8875843559d20265013ac755" }, @@ -36,10 +35,6 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" }, - "nvim-dap-python": { "branch": "master", "commit": "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad" }, - "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "2f1d6333bbec2e787774193c9fc7b447b878069a" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 19ef7e5..863f88d 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -158,4 +158,5 @@ pcode.active_javascript_config = { } pcode.active_php_config = false pcode.active_golang_config = false -pcode.active_python_config = true +pcode.active_python_config = false +pcode.active_cpp_config = true diff --git a/lua/plugins/cppcfg.lua b/lua/plugins/cppcfg.lua new file mode 100644 index 0000000..b30cd9a --- /dev/null +++ b/lua/plugins/cppcfg.lua @@ -0,0 +1,39 @@ +local M = {} +-- local file_name = vim.fn.expand("%:t") +-- local file_name_no_ext = vim.fn.expand("%:t:r") +if pcode.active_cpp_config then + M = { + { + "nvim-neotest/neotest", + event = "VeryLazy", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-neotest/nvim-nio", + "antoinemadec/FixCursorHold.nvim", + "nvim-lua/plenary.nvim", + "alfaix/neotest-gtest", + }, + config = function() + require("neotest").setup({ + adapters = { + require("neotest-gtest").setup({}), + }, + }) + end, + -- stylua: ignore + keys = { + { "T","",desc="  Test"}, + { "Tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File" }, + { "Tr", function() require("neotest").run.run() end, desc = "Run Nearest" }, + { "TT", function() require("neotest").run.run(vim.loop.cwd()) end, desc = "Run All Test Files" }, + { "Tl", function() require("neotest").run.run_last() end, desc = "Run Last" }, + { "Ts", function() require("neotest").summary.toggle() end, desc = "Toggle Summary" }, + { "To", function() require("neotest").output.open({ enter = true, auto_close = true }) end, desc = "Show Output" }, + { "TO", function() require("neotest").output_panel.toggle() end, desc = "Toggle Output Panel" }, + { "TS", function() require("neotest").run.stop() end, desc = "Stop" }, + { "rc", "terminalg++ --debug main.cpp -o main", desc = "Compile Debug main.cpp" }, + }, + }, + } +end +return M diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua index d8a73fc..60d7847 100644 --- a/lua/plugins/themes/_globalvar.lua +++ b/lua/plugins/themes/_globalvar.lua @@ -74,4 +74,11 @@ if pcode.active_python_config then pcode.nvim_dap = true end end +-- run if cpp config true +if pcode.active_cpp_config then + table.insert(pcode.treesitter_ensure_installed, "cpp") + table.insert(pcode.mason_ensure_installed, "clangd") + table.insert(pcode.null_ls_ensure_installed, "clang_format") + pcode.nvim_dap = true +end return {}