From a7c98c7cbb04340d48e625446b2e2e4b1c6ebf64 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Mon, 13 Mar 2023 02:42:54 +0900 Subject: [PATCH] update: nvim: satysfi filetype def & language server setup --- bin/install.ps1 | 3 +-- bin/install.sh | 3 ++- dotfiles/neovim/init.lua | 19 +++++++++++++++++++ .../satysfi_ls.lua} | 3 ++- 4 files changed, 24 insertions(+), 4 deletions(-) rename dotfiles/neovim/lua/lspconfig/{server_configuration/satysfi-ls.lua => server_configurations/satysfi_ls.lua} (85%) diff --git a/bin/install.ps1 b/bin/install.ps1 index ab80d3a..3311c6d 100644 --- a/bin/install.ps1 +++ b/bin/install.ps1 @@ -52,9 +52,8 @@ scoop import .\bin\windows\scoop_apps\scoop_minimal_apps.json # make symbolic links # neovim New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\init.lua -Target (Resolve-Path .\dotfiles\neovim\init.lua) -Force -New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\plugins.lua -Target (Resolve-Path .\dotfiles\neovim\lua\plugins.lua) -Force New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lualine_setup.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lualine_setup.lua) -Force -New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lsp_client_config.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lsp_client_config.lua) -Force +New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lspconfig\server_configurations\satysfi_ls.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lspconfig\server_configurations\satysfi_ls.lua) -Force # pwsh New-Item -ItemType SymbolicLink -Path $PROFILE -Target (Resolve-Path .\dotfiles\pwsh\powershell_profile.ps1) -Force New-Item -ItemType SymbolicLink -Path ~\.config\powershell\chezmoi_completion.ps1 -Target (Resolve-Path .\dotfiles\pwsh\chezmoi_completion.ps1) -Force diff --git a/bin/install.sh b/bin/install.sh index 792fc31..588ccbd 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -22,6 +22,7 @@ ln -sf $(pwd)/dotfiles/tmux.conf ~/.tmux.conf mkdir -p ~/.config/nvim ln -sf $(pwd)/dotfiles/neovim/init.lua ~/.config/nvim/init.lua mkdir -p ~/.config/nvim/lua -ln -sf $(pwd)/dotfiles/neovim/lua/plugins.lua ~/.config/nvim/lua/plugins.lua ln -sf $(pwd)/dotfiles/neovim/lua/lualine_setup.lua ~/.config/nvim/lua/lualine_setup.lua +mkdir -p ~/.config/nvim/lua/lspconfig/server_configurations +ln -sf $(pwd)/dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua ~/.config/nvim/lua/lspconfig/server_configurations/satysfi_ls.lua diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index fc265c8..02352fa 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -49,6 +49,18 @@ require('lazy').setup({ }, }) +----------------------------------------------------------- +-- Adding filetype 'satysfi' +vim.filetype.add { + extension = { + saty = 'satysfi', + satyh = 'satysfi', + satyg = 'satysfi', + }, + pattern = { + ['.*%.satyh%-%a+'] = 'satysfi', + }, +} ----------------------------------------------------------- -- basic configurations @@ -241,6 +253,13 @@ lspconfig.julials.setup { capabilities = capabilities, } +-- SATySFi +lspconfig.satysfi_ls.setup { + on_attach = on_attach, + capabilities = capabilities, + autostart = true, +} + -- nvim-cmp setup local cmp = require 'cmp' local luasnip = require 'luasnip' diff --git a/dotfiles/neovim/lua/lspconfig/server_configuration/satysfi-ls.lua b/dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua similarity index 85% rename from dotfiles/neovim/lua/lspconfig/server_configuration/satysfi-ls.lua rename to dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua index 78e30f7..1301c06 100644 --- a/dotfiles/neovim/lua/lspconfig/server_configuration/satysfi-ls.lua +++ b/dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua @@ -1,4 +1,4 @@ -# https://zenn.dev/monaqa/articles/2021-12-10-satysfi-language-server +-- https://zenn.dev/monaqa/articles/2021-12-10-satysfi-language-server local util = require 'lspconfig.util' return { @@ -18,3 +18,4 @@ return { }, }, } +