mirzaev
/
nvim
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

added "vasilevich/nginxbeautifier" formatter

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2023-03-27 02:16:49 +10:00
parent 2ec6167ae5
commit 32017c9f63
2 changed files with 100 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
install.sh
View File

@ -2,21 +2,25 @@
# Инициализация текста сообщений в зависимости от установленного языка в оболочке
if test (string match -ri "ru" "$LANG")
function print -a TYPE PARAM1 PARAM2 -d "Вывод сообщений по категориям"
function print -a TYPE PARAM1 PARAM2 -d "Текст сообщений"
switch $TYPE
case REPOSITORY_EXISTS
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Репозиторий \"wbthomason/packer.nvim\" уже существует. Переустановить? (y/N)";
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Репозиторий \"wbthomason/packer.nvim\" уже существует. Переустановить? (y/N) ";
case REPOSITORY_CREATED
set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Репозиторий \"wbthomason/packer.nvim\" установлен";
case FORMATTER_NGINX_INSTALL
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить форматировщик для NGINX? (\"vasilevich/nginxbeautifier\") (y/N) ";
end
end
else
function print -a TYPE PARAM1 PARAM2 -d "Display messages by category"
function print -a TYPE PARAM1 PARAM2 -d "Messages text"
switch $TYPE
case REPOSITORY_EXISTS
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "The \"wbthomason/packer.nvim\" repository already exists. Reinstall? (y/N)";
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "The \"wbthomason/packer.nvim\" repository already exists. Reinstall? (y/N) ";
case REPOSITORY_CREATED
set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Repository \"wbthomason/packer.nvim\" installed";
set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[WORK] "; set_color white; echo "Repository \"wbthomason/packer.nvim\" installed";
case FORMATTER_NGINX_INSTALL
set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[TASK] "; set_color white; echo "Install the formatter for NGINX? (\"vasilevich/nginxbeautifier\") (y/N) ";
end
end
end
@ -49,3 +53,15 @@ else
print REPOSITORY_CREATED
end
# Запрос выбора действия с репозиторием
set RESPONSE (read -n 1 -p "print FORMATTER_NGINX_INSTALL")
bind -e y
if test (string match -ri 'y' "$RESPONSE")
# Запрошена установка 'vasilevich/nginxbeautifier'
# Установка
npm install -g nginxbeautifier
end

23
lua/keymaps/plugins.lua
View File

@ -15,7 +15,7 @@ vim.keymap.set('n', '<space>d0', '<cmd>lua require(\'diaglist\').open_buffer_dia
--[[ noib3/nvim-cokeline ]]
-- Переключение вкладок
vim.keymap.set('n', '<tab>', '<Plug>(cokeline-focus-next)', { noremap = true, silent = true })
vim.keymap.set('n', '<tab>', '<plug>(cokeline-focus-next)', { noremap = true, silent = true })
vim.keymap.set('n', '<s-tab>', '<Plug>(cokeline-focus-prev)', { noremap = true, silent = true })
@ -44,14 +44,27 @@ lspconfig_on_attach = function(client, bufnr)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { noremap = true, silent = true, buffer = bufnr })
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, { noremap = true, silent = true, buffer = bufnr })
vim.keymap.set('n', 'gr', vim.lsp.buf.references, { noremap = true, silent = true, buffer = bufnr })
end
-- Formatting
vim.keymap.set({ 'n', 'v', 't' }, 'F', function()
if (vim.bo.filetype == 'nginx') then
-- NGINX configuration file
vim.api.nvim_exec('w', false)
vim.api.nvim_exec('! nginxbeautifier -i %', false)
vim.api.nvim_exec('redraw', false)
elseif (vim.lsp.buf.server_ready()) then
-- LSP-server is ready
-- Форматирование
vim.keymap.set({ 'n', 'v', 't' }, 'F', function()
vim.lsp.buf.format { async = true }
vim.api.nvim_command('PrettierAsync')
else
-- LSP-server not found
vim.api.nvim_exec('PrettierAsync', false)
end
end,
{ noremap = true, silent = true, buffer = bufnr })
end
--[[ lewis6991/gitsigns.nvim ]]