добавлены lsp-сервера а так же определение html файлов

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2023-02-26 23:05:20 +10:00
parent 9e43ba9054
commit 74cc3389e8
4 changed files with 60 additions and 65 deletions

5
ftdetect/html.lua Normal file
View File

@ -0,0 +1,5 @@
-- Инициализация настроек для файлов с типом ".log"
vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
pattern = '*.html',
command = 'set filetype=html'
})

View File

@ -10,13 +10,6 @@ local coq = require('coq')
-- Инициализация LSP-серверов -- Инициализация LSP-серверов
-- Инициализация "psalm" (LSP-сервер для PHP)
--[[ lspconfig.psalm.setup({
on_attach = lspconfig_on_attach,
coq.lsp_ensure_capabilities(),
capabilities = capabilities
}) ]]
-- Инициализация "intelephense" (LSP-сервер для PHP) -- Инициализация "intelephense" (LSP-сервер для PHP)
lspconfig.intelephense.setup({ lspconfig.intelephense.setup({
on_attach = lspconfig_on_attach, on_attach = lspconfig_on_attach,
@ -24,36 +17,28 @@ lspconfig.intelephense.setup({
capabilities = capabilities capabilities = capabilities
}) })
-- Инициализация "vscode-html-language-server" (готовый набросок для HTML) -- Инициализация "vscode-html-language-server" (LSP-сервер для HTML)
lspconfig.html.setup({ lspconfig.html.setup({
on_attach = lspconfig_on_attach, on_attach = lspconfig_on_attach,
coq.lsp_ensure_capabilities(), coq.lsp_ensure_capabilities(),
capabilities = capabilities capabilities = capabilities
}) })
-- Инициализация "vscode-html-language-server" (готовый набросок для CSS) -- Инициализация "vscode-html-language-server" (LSP-сервер для CSS)
lspconfig.cssls.setup({ lspconfig.cssls.setup({
on_attach = lspconfig_on_attach, on_attach = lspconfig_on_attach,
coq.lsp_ensure_capabilities(), coq.lsp_ensure_capabilities(),
capabilities = capabilities capabilities = capabilities
}) })
-- Инициализация "vscode-langservers-extracted" (готовый набросок для JavaScript и PostScript) -- Инициализация "vscode-langservers-extracted" (LSP-сервер для JavaScript и PostScript)
lspconfig.eslint.setup({ lspconfig.denols.setup({
on_attach = function(client, bufnr) on_attach = lspconfig_on_attach,
-- Инициализация команды "EslintFixAll" coq.lsp_ensure_capabilities(),
vim.api.nvim_create_autocmd("BufWritePre", { capabilities = capabilities
buffer = bufnr,
command = "EslintFixAll",
}) })
-- Вызов глобальной функции -- Инициализация "vscode-langservers-extracted" (LSP-сервер для JSON)
lspconfig_on_attach(client, bufnr)
end,
coq.lsp_ensure_capabilities()
})
-- Инициализация "vscode-langservers-extracted" (готовый набросок для JSON)
lspconfig.jsonls.setup({ lspconfig.jsonls.setup({
on_attach = lspconfig_on_attach, on_attach = lspconfig_on_attach,
coq.lsp_ensure_capabilities(), coq.lsp_ensure_capabilities(),

View File

@ -5,7 +5,7 @@ vim.opt.clipboard = 'unnamedplus'
--vim.opt.completeopt = 'menuone,noselect' --vim.opt.completeopt = 'menuone,noselect'
-- Не автокомментировать новые линии при переходе на новую строку -- Не автокомментировать новые линии при переходе на новую строку
vim.cmd('autocmd BufEnter * set fo-=c fo-=r fo-=o') --vim.cmd('autocmd BufEnter * set fo-=c fo-=r fo-=o')
-- Нумерация строк -- Нумерация строк
vim.opt.number = true vim.opt.number = true
@ -19,7 +19,7 @@ vim.opt.signcolumn = 'yes'
-- 24-битные цвета -- 24-битные цвета
vim.opt.termguicolors = true vim.opt.termguicolors = true
-- Отключение переноса строк -- Отключение переноса строк при достижении границы окна
vim.opt_local.wrap = false vim.opt_local.wrap = false
-- Отображение колонки курсора -- Отображение колонки курсора
@ -38,3 +38,8 @@ vim.opt.imsearch = 0
-- Поддержка буквы "ё" -- Поддержка буквы "ё"
vim.opt_local.spell = true vim.opt_local.spell = true
vim.opt_local.spelllang = 'ru_yo,en_us' vim.opt_local.spelllang = 'ru_yo,en_us'
-- Псевдонимы для языков
vim.g.markdown_fenced_languages = {
"ts=typescript"
}

View File

@ -270,22 +270,18 @@ time([[Defining packer_plugins]], false)
time([[Config for bufferline.nvim]], true) time([[Config for bufferline.nvim]], true)
try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/bufferline\frequire\0", "config", "bufferline.nvim") try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/bufferline\frequire\0", "config", "bufferline.nvim")
time([[Config for bufferline.nvim]], false) time([[Config for bufferline.nvim]], false)
-- Config for: lspkind-nvim
time([[Config for lspkind-nvim]], true)
try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lspkind\frequire\0", "config", "lspkind-nvim")
time([[Config for lspkind-nvim]], false)
-- Config for: symbols-outline.nvim -- Config for: symbols-outline.nvim
time([[Config for symbols-outline.nvim]], true) time([[Config for symbols-outline.nvim]], true)
try_loadstring("\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28plugins/symbols-outline\frequire\0", "config", "symbols-outline.nvim") try_loadstring("\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28plugins/symbols-outline\frequire\0", "config", "symbols-outline.nvim")
time([[Config for symbols-outline.nvim]], false) time([[Config for symbols-outline.nvim]], false)
-- Config for: lualine-lsp-progress
time([[Config for lualine-lsp-progress]], true)
try_loadstring("\27LJ\2\n<\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0!plugins/lualine-lsp-progress\frequire\0", "config", "lualine-lsp-progress")
time([[Config for lualine-lsp-progress]], false)
-- Config for: nvim-dap -- Config for: nvim-dap
time([[Config for nvim-dap]], true) time([[Config for nvim-dap]], true)
try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/dap\frequire\0", "config", "nvim-dap") try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/dap\frequire\0", "config", "nvim-dap")
time([[Config for nvim-dap]], false) time([[Config for nvim-dap]], false)
-- Config for: lspkind-nvim
time([[Config for lspkind-nvim]], true)
try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lspkind\frequire\0", "config", "lspkind-nvim")
time([[Config for lspkind-nvim]], false)
-- Config for: nvim-lint -- Config for: nvim-lint
time([[Config for nvim-lint]], true) time([[Config for nvim-lint]], true)
try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lint\frequire\0", "config", "nvim-lint") try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lint\frequire\0", "config", "nvim-lint")
@ -294,34 +290,30 @@ time([[Config for nvim-lint]], false)
time([[Config for trouble.nvim]], true) time([[Config for trouble.nvim]], true)
try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/trouble\frequire\0", "config", "trouble.nvim") try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/trouble\frequire\0", "config", "trouble.nvim")
time([[Config for trouble.nvim]], false) time([[Config for trouble.nvim]], false)
-- Config for: coq_nvim
time([[Config for coq_nvim]], true)
try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/coq\frequire\0", "config", "coq_nvim")
time([[Config for coq_nvim]], false)
-- Config for: nvim-web-devicons
time([[Config for nvim-web-devicons]], true)
try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugins/nvim-web-devicons\frequire\0", "config", "nvim-web-devicons")
time([[Config for nvim-web-devicons]], false)
-- Config for: diaglist.nvim
time([[Config for diaglist.nvim]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/diaglist\frequire\0", "config", "diaglist.nvim")
time([[Config for diaglist.nvim]], false)
-- Config for: lualine.nvim -- Config for: lualine.nvim
time([[Config for lualine.nvim]], true) time([[Config for lualine.nvim]], true)
try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lualine\frequire\0", "config", "lualine.nvim") try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lualine\frequire\0", "config", "lualine.nvim")
time([[Config for lualine.nvim]], false) time([[Config for lualine.nvim]], false)
-- Config for: fidget.nvim -- Config for: nvim-treesitter
time([[Config for fidget.nvim]], true) time([[Config for nvim-treesitter]], true)
try_loadstring("\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19plugins/fidget\frequire\0", "config", "fidget.nvim") try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/treesitter\frequire\0", "config", "nvim-treesitter")
time([[Config for fidget.nvim]], false) time([[Config for nvim-treesitter]], false)
-- Config for: lush.nvim -- Config for: nvim-web-devicons
time([[Config for lush.nvim]], true) time([[Config for nvim-web-devicons]], true)
try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lush\frequire\0", "config", "lush.nvim") try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugins/nvim-web-devicons\frequire\0", "config", "nvim-web-devicons")
time([[Config for lush.nvim]], false) time([[Config for nvim-web-devicons]], false)
-- Config for: gitsigns.nvim -- Config for: telescope.nvim
time([[Config for gitsigns.nvim]], true) time([[Config for telescope.nvim]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/gitsigns\frequire\0", "config", "gitsigns.nvim") try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/telescope\frequire\0", "config", "telescope.nvim")
time([[Config for gitsigns.nvim]], false) time([[Config for telescope.nvim]], false)
-- Config for: diaglist.nvim
time([[Config for diaglist.nvim]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/diaglist\frequire\0", "config", "diaglist.nvim")
time([[Config for diaglist.nvim]], false)
-- Config for: coq_nvim
time([[Config for coq_nvim]], true)
try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/coq\frequire\0", "config", "coq_nvim")
time([[Config for coq_nvim]], false)
-- Config for: neo-tree.nvim -- Config for: neo-tree.nvim
time([[Config for neo-tree.nvim]], true) time([[Config for neo-tree.nvim]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/neo-tree\frequire\0", "config", "neo-tree.nvim") try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/neo-tree\frequire\0", "config", "neo-tree.nvim")
@ -330,18 +322,26 @@ time([[Config for neo-tree.nvim]], false)
time([[Config for vim-test]], true) time([[Config for vim-test]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/vim-test\frequire\0", "config", "vim-test") try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/vim-test\frequire\0", "config", "vim-test")
time([[Config for vim-test]], false) time([[Config for vim-test]], false)
-- Config for: telescope.nvim -- Config for: fidget.nvim
time([[Config for telescope.nvim]], true) time([[Config for fidget.nvim]], true)
try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/telescope\frequire\0", "config", "telescope.nvim") try_loadstring("\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19plugins/fidget\frequire\0", "config", "fidget.nvim")
time([[Config for telescope.nvim]], false) time([[Config for fidget.nvim]], false)
-- Config for: nvim-treesitter
time([[Config for nvim-treesitter]], true)
try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/treesitter\frequire\0", "config", "nvim-treesitter")
time([[Config for nvim-treesitter]], false)
-- Config for: nvim-autopairs -- Config for: nvim-autopairs
time([[Config for nvim-autopairs]], true) time([[Config for nvim-autopairs]], true)
try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/autopairs\frequire\0", "config", "nvim-autopairs") try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/autopairs\frequire\0", "config", "nvim-autopairs")
time([[Config for nvim-autopairs]], false) time([[Config for nvim-autopairs]], false)
-- Config for: lush.nvim
time([[Config for lush.nvim]], true)
try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lush\frequire\0", "config", "lush.nvim")
time([[Config for lush.nvim]], false)
-- Config for: lualine-lsp-progress
time([[Config for lualine-lsp-progress]], true)
try_loadstring("\27LJ\2\n<\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0!plugins/lualine-lsp-progress\frequire\0", "config", "lualine-lsp-progress")
time([[Config for lualine-lsp-progress]], false)
-- Config for: gitsigns.nvim
time([[Config for gitsigns.nvim]], true)
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/gitsigns\frequire\0", "config", "gitsigns.nvim")
time([[Config for gitsigns.nvim]], false)
-- Load plugins in order defined by `after` -- Load plugins in order defined by `after`
time([[Sequenced loading]], true) time([[Sequenced loading]], true)
vim.cmd [[ packadd nvim-lspconfig ]] vim.cmd [[ packadd nvim-lspconfig ]]