From 09a3262cb94b0abd1064fbb7c4a13d04a36e4049 Mon Sep 17 00:00:00 2001
From: Ariel D'Alessandro <ariel.dalessandro@auto1.com>
Date: Mon, 19 Sep 2022 11:51:50 +0200
Subject: Some improvements

---
 after/plugin/cmp.lua     | 4 ++++
 after/plugin/lsp.lua     | 5 +++--
 after/plugin/null-ls.lua | 9 ++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'after/plugin')

diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
index 0065502..3dcefd5 100644
--- a/after/plugin/cmp.lua
+++ b/after/plugin/cmp.lua
@@ -7,6 +7,10 @@ local lspkind = require("lspkind")
 local luasnip = require("luasnip")
 local cmp_autopairs = require("nvim-autopairs.completion.cmp")
 
+if cmp == nil then
+    return
+end
+
 cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
 
 cmp.setup({
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 5abbb14..981346c 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -55,6 +55,9 @@ vim.keymap.set("n", "<leader>vf", function()
     return vim.lsp.buf.format({ async = true })
 end, {})
 
+vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, { buffer = 0 })
+vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, { buffer = 0 })
+
 local function on_attach(client, bufnr)
 	local filetype = vim.api.nvim_buf_get_option(0, "filetype")
 	-- keymaps for lsp
@@ -65,8 +68,6 @@ local function on_attach(client, bufnr)
 	    vim.lsp.buf.definition()
 	end, { buffer = 0 })
 	vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, { 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("i", "<c-h>", vim.lsp.buf.signature_help, { buffer = 0 })
 	vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true })
 
diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua
index f6a1c5b..185586b 100644
--- a/after/plugin/null-ls.lua
+++ b/after/plugin/null-ls.lua
@@ -9,7 +9,13 @@ local sources = {
 	null_ls.builtins.code_actions.gitsigns,
 	null_ls.builtins.formatting.stylua,
 	-- null_ls.builtins.diagnostics.eslint,
-	-- null_ls.builtins.diagnostics.phpstan,
+	null_ls.builtins.diagnostics.phpstan.with({
+        command = "./bin/phpstan",
+        to_temp_file= false,
+    }),
+	null_ls.builtins.diagnostics.phpcs.with({
+        command = "./bin/phpcs",
+    }),
 	-- null_ls.builtins.formatting.phpcsfixer,
 	-- null_ls.builtins.formatting.pint,
 	null_ls.builtins.diagnostics.golangci_lint,
@@ -25,4 +31,5 @@ local sources = {
 
 null_ls.setup({
 	sources = sources,
+    debug = true,
 })
-- 
cgit v1.2.3