From 74cc3389e8270396a96f53334b9a5d4c49b02537 Mon Sep 17 00:00:00 2001 From: mirzaev Date: Sun, 26 Feb 2023 23:05:20 +1000 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20lsp-=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=20=D0=B0=20=D1=82=D0=B0=D0=BA=20=D0=B6=D0=B5=20=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20html?= =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ftdetect/html.lua | 5 +++ lua/plugins/lspconfig.lua | 31 ++++----------- lua/settings/system.lua | 9 ++++- plugin/packer_compiled.lua | 80 +++++++++++++++++++------------------- 4 files changed, 60 insertions(+), 65 deletions(-) create mode 100644 ftdetect/html.lua diff --git a/ftdetect/html.lua b/ftdetect/html.lua new file mode 100644 index 0000000..dc43adf --- /dev/null +++ b/ftdetect/html.lua @@ -0,0 +1,5 @@ +-- Инициализация настроек для файлов с типом ".log" +vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, { + pattern = '*.html', + command = 'set filetype=html' +}) diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 43eb929..9fad143 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -10,13 +10,6 @@ local coq = require('coq') -- Инициализация LSP-серверов --- Инициализация "psalm" (LSP-сервер для PHP) ---[[ lspconfig.psalm.setup({ - on_attach = lspconfig_on_attach, - coq.lsp_ensure_capabilities(), - capabilities = capabilities -}) ]] - -- Инициализация "intelephense" (LSP-сервер для PHP) lspconfig.intelephense.setup({ on_attach = lspconfig_on_attach, @@ -24,36 +17,28 @@ lspconfig.intelephense.setup({ capabilities = capabilities }) --- Инициализация "vscode-html-language-server" (готовый набросок для HTML) +-- Инициализация "vscode-html-language-server" (LSP-сервер для HTML) lspconfig.html.setup({ on_attach = lspconfig_on_attach, coq.lsp_ensure_capabilities(), capabilities = capabilities }) --- Инициализация "vscode-html-language-server" (готовый набросок для CSS) +-- Инициализация "vscode-html-language-server" (LSP-сервер для CSS) lspconfig.cssls.setup({ on_attach = lspconfig_on_attach, coq.lsp_ensure_capabilities(), capabilities = capabilities }) --- Инициализация "vscode-langservers-extracted" (готовый набросок для JavaScript и PostScript) -lspconfig.eslint.setup({ - on_attach = function(client, bufnr) - -- Инициализация команды "EslintFixAll" - vim.api.nvim_create_autocmd("BufWritePre", { - buffer = bufnr, - command = "EslintFixAll", - }) - - -- Вызов глобальной функции - lspconfig_on_attach(client, bufnr) - end, - coq.lsp_ensure_capabilities() +-- Инициализация "vscode-langservers-extracted" (LSP-сервер для JavaScript и PostScript) +lspconfig.denols.setup({ + on_attach = lspconfig_on_attach, + coq.lsp_ensure_capabilities(), + capabilities = capabilities }) --- Инициализация "vscode-langservers-extracted" (готовый набросок для JSON) +-- Инициализация "vscode-langservers-extracted" (LSP-сервер для JSON) lspconfig.jsonls.setup({ on_attach = lspconfig_on_attach, coq.lsp_ensure_capabilities(), diff --git a/lua/settings/system.lua b/lua/settings/system.lua index 6f59079..fae8cd3 100644 --- a/lua/settings/system.lua +++ b/lua/settings/system.lua @@ -5,7 +5,7 @@ vim.opt.clipboard = 'unnamedplus' --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 @@ -19,7 +19,7 @@ vim.opt.signcolumn = 'yes' -- 24-битные цвета vim.opt.termguicolors = true --- Отключение переноса строк +-- Отключение переноса строк при достижении границы окна vim.opt_local.wrap = false -- Отображение колонки курсора @@ -38,3 +38,8 @@ vim.opt.imsearch = 0 -- Поддержка буквы "ё" vim.opt_local.spell = true vim.opt_local.spelllang = 'ru_yo,en_us' + +-- Псевдонимы для языков +vim.g.markdown_fenced_languages = { + "ts=typescript" +} diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 12f2332..b137c7c 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -270,22 +270,18 @@ time([[Defining packer_plugins]], false) 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") 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 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") 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 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") 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 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") @@ -294,34 +290,30 @@ time([[Config for nvim-lint]], false) 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") 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 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") time([[Config for lualine.nvim]], false) --- Config for: fidget.nvim -time([[Config for fidget.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\19plugins/fidget\frequire\0", "config", "fidget.nvim") -time([[Config for fidget.nvim]], 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: 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) +-- 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-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: telescope.nvim +time([[Config for telescope.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") +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 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") @@ -330,18 +322,26 @@ time([[Config for neo-tree.nvim]], false) 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") time([[Config for vim-test]], false) --- Config for: telescope.nvim -time([[Config for telescope.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") -time([[Config for telescope.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: fidget.nvim +time([[Config for fidget.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\19plugins/fidget\frequire\0", "config", "fidget.nvim") +time([[Config for fidget.nvim]], false) -- Config for: nvim-autopairs 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") 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` time([[Sequenced loading]], true) vim.cmd [[ packadd nvim-lspconfig ]]