Add lazygit, refactor code actions, fix lsp command

7 files changed, 19 insertions, 9 deletions

diff --git a/after/plugin/feline.lua b/after/plugin/feline.lua
index b974ef4..f559256 100644
--- a/after/plugin/feline.lua
+++ b/after/plugin/feline.lua
@@ -30,7 +30,7 @@ feline.winbar.setup({
                         name = 'file_info',
                         opts = {
                             type = 'full-path',
-                            file_modified_icon = '[M]'
+                            file_modified_icon = '[*]'
                         },
                     },
                     hl = {
diff --git a/init.lua b/init.lua
index cc24210..002d9e1 100644
--- a/init.lua
+++ b/init.lua
@@ -18,5 +18,5 @@ require "alpha.telescope.setup"
 require "alpha.telescope.mappings"
 require "alpha.dap"
 
-require "alpha.refactor"
+-- require "alpha.refactor"
 require "alpha.lsp"
diff --git a/lua/alpha/lsp.lua b/lua/alpha/lsp.lua
index 8d48993..95b7148 100644
--- a/lua/alpha/lsp.lua
+++ b/lua/alpha/lsp.lua
@@ -24,13 +24,13 @@ local function on_attach(client)
 	vim.keymap.set("n", "<leader>vf", vim.lsp.buf.formatting, { buffer = 0 })
 	vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, { buffer = 0 })
 	vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, { buffer = 0 })
+	vim.keymap.set("n", "<leader>vca", vim.lsp.buf.code_action, { buffer = 0 })
 	vim.keymap.set("i", "<c-k>", vim.lsp.buf.signature_help, { buffer = 0 })
 	vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true })
 
 	telescope_mapper("gr", "lsp_references", nil, true)
 	telescope_mapper("<leader>pv", "find_symbol", nil, true)
 	telescope_mapper("<leader>pd", "lsp_document_symbols", nil, true)
-    telescope_mapper("<leader>vca", "lsp_code_actions", nil, true)
 
 	vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc"
 
diff --git a/lua/alpha/php_code_actions.lua b/lua/alpha/php_code_actions.lua
index 998fcb5..5bca3c3 100644
--- a/lua/alpha/php_code_actions.lua
+++ b/lua/alpha/php_code_actions.lua
@@ -38,6 +38,9 @@ local php_setter_getter_actions = {
 	generator = {
 		fn = function(context)
 			local cursor_node = utils.get_master_node()
+            if cursor_node == nil then
+                return
+            end
 			if cursor_node.type(cursor_node) ~= "property_declaration" then
 				return
 			end
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index 446c1d6..7b9f4c4 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -97,6 +97,8 @@ return require("packer").startup(function(use)
 
 	use("github/copilot.vim")
 
+    use "kdheepak/lazygit.nvim"
+
 	use({
 		"nvim-telescope/telescope.nvim",
 		requires = {
diff --git a/lua/alpha/refactor.lua b/lua/alpha/refactor.lua
index 418a078..8474b87 100644
--- a/lua/alpha/refactor.lua
+++ b/lua/alpha/refactor.lua
@@ -243,7 +243,7 @@ M.new_property = function ()
     vim.api.nvim_win_set_cursor(0, {row, column})
 end
 
-vim.keymap.set("n", "<leader>rs", M.setter_getter, {})
-vim.keymap.set("n", "<leader>rn", M.new_property, {})
+-- vim.keymap.set("n", "<leader>rs", M.setter_getter, {})
+-- vim.keymap.set("n", "<leader>rn", M.new_property, {})
 
 return M
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index f10ab8c..219c165 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -160,6 +160,11 @@ _G.packer_plugins = {
     path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/impatient.nvim",
     url = "https://github.com/lewis6991/impatient.nvim"
   },
+  ["lazygit.nvim"] = {
+    loaded = true,
+    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lazygit.nvim",
+    url = "https://github.com/kdheepak/lazygit.nvim"
+  },
   ["lspkind-nvim"] = {
     loaded = true,
     path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
@@ -439,14 +444,14 @@ time([[Defining packer_plugins]], false)
 time([[Config for nvim-projectconfig]], true)
 try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
 time([[Config for nvim-projectconfig]], false)
--- Config for: nvim-colorizer.lua
-time([[Config for nvim-colorizer.lua]], true)
-try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
-time([[Config for nvim-colorizer.lua]], false)
 -- Config for: git-worktree.nvim
 time([[Config for git-worktree.nvim]], true)
 try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\17git-worktree\frequire\0", "config", "git-worktree.nvim")
 time([[Config for git-worktree.nvim]], false)
+-- Config for: nvim-colorizer.lua
+time([[Config for nvim-colorizer.lua]], true)
+try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
+time([[Config for nvim-colorizer.lua]], false)
 
 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)