Extract composer, set file creator as part of php actions

4 files changed, 5 insertions, 34 deletions

diff --git a/lua/alpha/composer.lua b/lua/alpha/composer.lua
deleted file mode 100644
index 4792979..0000000
--- a/lua/alpha/composer.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-local M = {}
-
-local function get_composer_file()
-    if vim.fn.findfile("composer.json") ~= "" then
-        return vim.fn.json_decode(vim.fn.readfile(vim.fn.getcwd() .. "/composer.json"))
-    end
-
-    if vim.fn.findfile("master/composer.json") ~= "" then
-        return vim.fn.json_decode(vim.fn.readfile(vim.fn.getcwd() .. "/master/composer.json"))
-    end
-
-    return nil
-end
-
-M.query = function (path)
-    local target = get_composer_file()
-
-    if target == nil then
-        return nil
-    end
-
-    for _, part in ipairs(path) do
-        target = target[part]
-        if target == nil then
-            return nil
-        end
-    end
-
-    return target
-end
-
-return M
diff --git a/lua/alpha/dap.lua b/lua/alpha/dap.lua
index 74004e7..5d6e403 100644
--- a/lua/alpha/dap.lua
+++ b/lua/alpha/dap.lua
@@ -1,5 +1,5 @@
 local dap, dapui, dap_go = require("dap"), require("dapui"), require("dap-go")
-local composer = require("alpha.composer")
+local composer = require("composer")
 
 require("nvim-dap-virtual-text").setup({})
 -- dap.set_log_level('TRACE')
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index 0d0b894..9e8e8df 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -215,6 +215,7 @@ return require("packer").startup(function(use)
 	-- local_use("telescope-laravel.nvim")
 	local_use("php-code-actions.nvim")
 	local_use("laravel.nvim")
+	local_use("composer.nvim")
 
 	use("habamax/vim-godot")
 
@@ -233,4 +234,6 @@ return require("packer").startup(function(use)
 			require("mind").setup()
 		end,
 	})
+
+	use({ "stevearc/dressing.nvim" })
 end)
diff --git a/lua/alpha/snips/ft/php.lua b/lua/alpha/snips/ft/php.lua
index a9bbe37..9673a49 100644
--- a/lua/alpha/snips/ft/php.lua
+++ b/lua/alpha/snips/ft/php.lua
@@ -1,5 +1,5 @@
 local ls = require("luasnip")
-local composer = require("alpha.composer")
+local composer = require("composer")
 
 local snippet_from_nodes = ls.sn
 local c = ls.choice_node