From 884f1970a796cc3280552f2e6a51ceceaa5f01dd Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 25 Aug 2024 16:03:19 +0200 Subject: [PATCH] nvim: update --- nvim/lazy-lock.json | 30 +++++++++++++++------------- nvim/lua/config/cmp.lua | 16 +++++++-------- nvim/lua/config/colorscheme.lua | 3 ++- nvim/lua/config/options.lua | 2 +- nvim/lua/plugins/lsp.lua | 6 +++--- nvim/queries/php_only/highlights.scm | 5 +++-- nvim/queries/php_only/indents.scm | 8 ++++---- 7 files changed, 36 insertions(+), 34 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 850bb73..9fe3f35 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,35 +1,37 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "catppuccin": { "branch": "main", "commit": "f8564054831b45bac52f91bb8d12c68631b13e1a" }, + "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" }, + "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "0f4f299dfea09d2adfd7a1da05149a0844ac8eee" }, + "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, "fd": { "branch": "master", "commit": "9cf415ccc73e633cf4ee848a347ab5635595ccf3" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" }, "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" }, - "mini.nvim": { "branch": "main", "commit": "d8faae693d266ee4f3a2bf1fb7ca4bc81314c3e9" }, + "mini.nvim": { "branch": "main", "commit": "71b5694a2df4f7e3661855eb8e2814980d2e0ac9" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, - "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, - "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-lspconfig": { "branch": "master", "commit": "20906fce8587c85266b26d0b35d1bc0df2d49d58" }, + "nvim-treesitter": { "branch": "master", "commit": "6699eae8ba4551fe927da0f0f3f61ae085f836aa" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, + "oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } diff --git a/nvim/lua/config/cmp.lua b/nvim/lua/config/cmp.lua index d71556c..d3d74a7 100644 --- a/nvim/lua/config/cmp.lua +++ b/nvim/lua/config/cmp.lua @@ -8,24 +8,21 @@ return function() local selectPrev = utils.selectPrev({ behavior = cmp.SelectBehavior.Insert }) local selectNext = utils.selectNext({ behavior = cmp.SelectBehavior.Insert }) - local windowstyle = { - border = vim.g.float_border or "none", - winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None", - } - return { preselect = false, completion = { - completeopt = "menuone,longest,noinsert,preview", + completeopt = "menu,menuone,longest,popup", }, view = { entries = { name = "custom", selection_order = "near_cursor" }, }, window = { - documentation = windowstyle, - completion = vim.tbl_deep_extend("force", windowstyle, { + documentation = { + border = { "", "", "", "", "", "", "", " " }, + }, + completion = { scrolloff = 4, - }), + }, }, mapping = { [""] = selectPrev, @@ -51,6 +48,7 @@ return function() }), }, sources = { + { name = 'nvim_lsp_signature_help' }, { name = "nvim_lsp" }, { name = "luasnip" }, { name = "buffer" }, diff --git a/nvim/lua/config/colorscheme.lua b/nvim/lua/config/colorscheme.lua index 9e29d14..503a188 100644 --- a/nvim/lua/config/colorscheme.lua +++ b/nvim/lua/config/colorscheme.lua @@ -110,9 +110,10 @@ return { ["@markup.italic"] = { fg = colors.green }, -- PHP specific + ["@keyword.import.php"] = { link = "@keyword" }, ["@class_name.php"] = { link = "@text" }, ["@extend_name.php"] = { link = "@text" }, - ["@implements_name.php"] = { link = "@text" }, + ["@implement_name.php"] = { link = "@text" }, ["@namespace_name.php"] = { link = "@text" }, ["@namespace_alias.php"] = { link = "@text" }, } diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index f8b7665..f64de35 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -52,7 +52,7 @@ set.splitbelow = true -- See `:help 'list'` -- and `:help 'listchars'` set.list = false -set.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +set.listchars = { tab = ' »', space = '·', nbsp = '␣' } set.fillchars = { foldopen = icons.fold.open, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index eb0bcf0..6b59822 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -61,9 +61,9 @@ return { }) end - if client.supports_method('textDocument/hover') then - --utils.signature_help_on_hover(bufnr) - end + -- if client.supports_method('textDocument/hover') then + -- utils.signature_help_on_hover(bufnr) + -- end if (opts.document_hightlight or server_opt.document_highlight or false) and client.supports_method('textDocument/documentHighlight') then utils.document_highlight(bufnr) diff --git a/nvim/queries/php_only/highlights.scm b/nvim/queries/php_only/highlights.scm index c7c4539..608d819 100644 --- a/nvim/queries/php_only/highlights.scm +++ b/nvim/queries/php_only/highlights.scm @@ -10,6 +10,8 @@ (class_interface_clause (name) @implement_name) ]) +(interface_declaration (name) @class_name) + ; tag "use" traits as text (use_declaration (name) @text) @@ -17,7 +19,6 @@ (namespace_use_declaration (namespace_use_clause [ (qualified_name [ (name) @namespace_name - (namespace_name_as_prefix (namespace_name (name) @namespace_name)) ]) - (namespace_aliasing_clause (name) @namespace_alias) + alias: (name) @namespace_name ])) diff --git a/nvim/queries/php_only/indents.scm b/nvim/queries/php_only/indents.scm index eea446d..2b1b148 100644 --- a/nvim/queries/php_only/indents.scm +++ b/nvim/queries/php_only/indents.scm @@ -3,8 +3,8 @@ ; Fix for phpdoc comments that don't align * properly. ; This is black magic. I came up with it myself but ; i don't know why it works. -(ERROR - "/" - "**" - @indent.align) +;(ERROR +; "/" +; "**" +; @indent.align)