diff --git a/nvim/lua/user/lsp/mason.lua b/nvim/lua/user/lsp/mason.lua index b23d7bf..e660506 100644 --- a/nvim/lua/user/lsp/mason.lua +++ b/nvim/lua/user/lsp/mason.lua @@ -3,7 +3,8 @@ local servers = { "pyright", "tsserver", "terraformls", - "emmet_ls", + "phpactor", + "emmet_language_server", } require("mason").setup() diff --git a/nvim/lua/user/lsp/settings/emmet_language_server.lua b/nvim/lua/user/lsp/settings/emmet_language_server.lua new file mode 100644 index 0000000..cfc20a1 --- /dev/null +++ b/nvim/lua/user/lsp/settings/emmet_language_server.lua @@ -0,0 +1,13 @@ +return { + filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue", "blade", "php" }, + init_options = { + excludeLanguages = {}, + extensionsPath = {}, + preferences = {}, + showAbbreviationSuggestions = true, + showExpandedAbbreviation = "always", + showSuggestionsAsSnippets = false, + syntaxProfiles = {}, + variables = {}, + }, +} diff --git a/nvim/lua/user/lsp/settings/emmet_ls.lsp b/nvim/lua/user/lsp/settings/emmet_ls.lsp deleted file mode 100644 index 4e31f86..0000000 --- a/nvim/lua/user/lsp/settings/emmet_ls.lsp +++ /dev/null @@ -1,8 +0,0 @@ -return { - filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue" }, - init_options = { - html = { - ["bem.enabled"] = true - } - } -} diff --git a/nvim/lua/user/lsp/settings/lua_ls.lsp b/nvim/lua/user/lsp/settings/lua_ls.lua similarity index 100% rename from nvim/lua/user/lsp/settings/lua_ls.lsp rename to nvim/lua/user/lsp/settings/lua_ls.lua diff --git a/nvim/lua/user/lsp/settings/phpactor.lsp b/nvim/lua/user/lsp/settings/phpactor.lua similarity index 100% rename from nvim/lua/user/lsp/settings/phpactor.lsp rename to nvim/lua/user/lsp/settings/phpactor.lua diff --git a/nvim/lua/user/lsp/settings/pyright.lsp b/nvim/lua/user/lsp/settings/pyright.lua similarity index 100% rename from nvim/lua/user/lsp/settings/pyright.lsp rename to nvim/lua/user/lsp/settings/pyright.lua