Merge branch 'main' of labs.scarif.space:chris/nvim

This commit is contained in:
Chris
2025-07-24 14:31:25 +01:00
2 changed files with 65 additions and 60 deletions

View File

@@ -124,65 +124,19 @@ return {
local mason_registry = require 'mason-registry'
local vue_language_server_path = vim.fn.expand '$MASON/packages/vue-language-server/node_modules/@vue/language-server'
local servers = {
-- -- clangd = {},
-- -- gopls = {},
-- -- pyright = {},
-- -- rust_analyzer = {},
-- -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-- --
-- -- Some languages (like typescript) have entire language plugins that can be useful:
-- -- https://github.com/pmizio/typescript-tools.nvim
-- --
-- -- But for many setups, the LSP (`ts_ls`) will work just fine
-- -- ts_ls = {},
-- --
--
-- lua_ls = {
-- -- cmd = { ... },
-- -- filetypes = { ... },
-- -- capabilities = {},
-- settings = {
-- Lua = {
-- completion = {
-- callSnippet = 'Replace',
-- },
-- -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- -- diagnostics = { disable = { 'missing-fields' } },
-- },
-- },
-- },
-- ts_ls = {
-- init_options = {
-- plugins = {
-- {
-- name = '@vue/typescript-plugin',
-- location = vue_language_server_path,
-- languages = { 'vue' },
-- },
-- },
-- preferences = {
-- importModuleSpecifierEnding = 'js',
-- importModuleSpecifierPreference = 'project-relative',
-- },
-- },
-- filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
-- capabilities = {
-- documentFormattingProvider = true,
-- documentRangeFormattingProvider = true,
-- },
-- },
--
-- phpactor = {
-- on_attach = function(client, bufnr)
-- client.server_capabilities.documentFormattingProvider = false
-- end,
-- init_options = {
-- ['language_server_phpstan.enabled'] = false,
-- ['language_server_psalm.enabled'] = false,
-- ['language_server_php_cs_fixer.enabled'] = false,
-- ['language_server_php_cs_fixer.bin'] = vim.fn.expand '~/.local/share/composer/vendor/bin/php-cs-fixer',
-- },
-- },
clangd = {},
gopls = {},
pyright = {},
rust_analyzer = {},
lua_ls = {
settings = {
Lua = {
completion = {
callSnippet = 'Replace',
},
},
},
},
phpactor = {
init_options = {
['language_server_phpstan.enabled'] = false,