Compare commits

..

No commits in common. "a660f0c7883e279c577272cd9d4bcda58506a4da" and "71dac4d82f2be3e0e358631dc7197abe77639d39" have entirely different histories.

4 changed files with 39 additions and 25 deletions

View File

@ -354,6 +354,7 @@ require('custom.catppuccin')
require('custom.lua-line')
require('custom.telescope')
require('custom.lspconfig')
require('custom.lspsaga')
require('custom.nvim-cmp')
require('custom.toggleterm')
require('custom.autopairs')

View File

@ -1,9 +1,9 @@
-- lsp.lua (replace your current file with this)
-- import cmp-nvim-lsp plugin safely
-- local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-- if not cmp_nvim_lsp_status then
-- return
-- end
local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
if not cmp_nvim_lsp_status then
return
end
local keymap = vim.keymap -- for conciseness
@ -84,7 +84,8 @@ local on_attach = function(_, bufnr)
end
-- capabilities
local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities = cmp_nvim_lsp.default_capabilities()
-- helper for registering server configs (lazy attach)
local function setup_server(name, config)
local cfg = vim.tbl_deep_extend("force", {
@ -128,13 +129,9 @@ root_dir = function(fname)
or util.path.dirname(fname)
end
local fallback_root_dir = function(fname)
return util.root_pattern("composer.json", ".git")(fname) or util.path.dirname(fname)
end
setup_server("phpactor", {
filetypes = { "php" },
-- root_dir = fallback_root_dir,
root_dir = fallback_root_dir,
init_options = {
["language_server_phpstan.enabled"] = true,
["language_server_psalm.enabled"] = false,
@ -153,7 +150,7 @@ vim.lsp.config("lua_ls", {
setup_server("intelephense", {
filetypes = { "php" },
-- root_dir = fallback_root_dir,
root_dir = fallback_root_dir,
init_options = {
licenceKey = vim.fn.readfile(vim.fn.expand("$HOME/.config/intelephense/license.txt"))[1],
},

View File

@ -0,0 +1,24 @@
-- import lspsaga safely
-- local saga_status, saga = pcall(require, "lspsaga")
-- if not saga_status then
-- return
-- end
require("lazy").setup({
"glepnir/lspsaga.nvim",
event = "BufRead",
config = function()
require("lspsaga").setup({})
end,
dependencies = { { "nvim-tree/nvim-web-devicons" } },
-- keybinds for navigation in lspsaga window
move_in_saga = { prev = "<C-k>", next = "<C-j>" },
-- use enter to open file with finder
finder_action_keys = {
open = "<CR>",
},
-- use enter to open file with definition preview
definition_action_keys = {
edit = "<CR>",
},
})

View File

@ -27,23 +27,15 @@ return {
{ "startup-nvim/startup.nvim", dependencies = "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
{
'nvimdev/lspsaga.nvim',
"glepnir/lspsaga.nvim",
event = "BufRead",
config = function()
require('lspsaga').setup({})
require("lspsaga").setup({})
end,
dependencies = {
'nvim-treesitter/nvim-treesitter', -- optional
'nvim-tree/nvim-web-devicons', -- optional
},
move_in_saga = { prev = "<C-k>", next = "<C-j>" },
-- use enter to open file with finder
finder_action_keys = {
open = "<CR>",
},
-- use enter to open file with definition preview
definition_action_keys = {
edit = "<CR>",
{ "nvim-tree/nvim-web-devicons" },
--Please make sure you install markdown and markdown_inline parser
{ "nvim-treesitter/nvim-treesitter" },
},
},