From 7c4499728932fb8bbf30a479926489e90f3cfde0 Mon Sep 17 00:00:00 2001 From: jdhao Date: Thu, 16 Feb 2023 17:39:23 +0800 Subject: [PATCH] refactor: lua language server rename (#185) The lua language server from sumneko had changed its repo and created a new organizational repo. See also https://github.com/neovim/nvim-lspconfig/pull/2439. --- docs/nvim_setup_linux.sh | 22 +++++++++++----------- docs/nvim_setup_windows.ps1 | 14 +++++++------- lua/config/lsp.lua | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/nvim_setup_linux.sh b/docs/nvim_setup_linux.sh index 249ab35..7e08d91 100755 --- a/docs/nvim_setup_linux.sh +++ b/docs/nvim_setup_linux.sh @@ -124,27 +124,27 @@ fi ####################################################################### # lua-language-server # ####################################################################### -SUMNEKO_LUA_DIR=$HOME/tools/lua-language-server -SUMNEKO_LUA_SRC_NAME=$HOME/packages/lua-language-server.tar.gz -SUMNEKO_LUA_LINK="https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-linux-x64.tar.gz" +LUA_LS_DIR=$HOME/tools/lua-language-server +LUA_LS_SRC=$HOME/packages/lua-language-server.tar.gz +LUA_LS_LINK="https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-linux-x64.tar.gz" -if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$SUMNEKO_LUA_DIR/bin/lua-language-server" ]]; then +if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$LUA_LS_DIR/bin/lua-language-server" ]]; then echo 'Install lua-language-server' - if [[ ! -f $SUMNEKO_LUA_SRC_NAME ]]; then + if [[ ! -f $LUA_LS_SRC ]]; then echo "Downloading lua-language-server and renaming" - wget $SUMNEKO_LUA_LINK -O "$SUMNEKO_LUA_SRC_NAME" + wget $LUA_LS_LINK -O "$LUA_LS_SRC" fi - if [[ ! -d "$SUMNEKO_LUA_DIR" ]]; then + if [[ ! -d "$LUA_LS_DIR" ]]; then echo "Creating lua-language-server directory under tools directory" - mkdir -p "$SUMNEKO_LUA_DIR" - echo "Extracting to directory $SUMNEKO_LUA_DIR" + mkdir -p "$LUA_LS_DIR" + echo "Extracting to directory $LUA_LS_DIR" - tar zxvf "$SUMNEKO_LUA_SRC_NAME" -C "$SUMNEKO_LUA_DIR" + tar zxvf "$LUA_LS_SRC" -C "$LUA_LS_DIR" fi if [[ "$ADD_TO_SYSTEM_PATH" = true ]] && [[ "$USE_BASH_SHELL" = true ]]; then - echo "export PATH=\"$SUMNEKO_LUA_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile" + echo "export PATH=\"$LUA_LS_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile" fi else echo "lua-language-server is already installed. Skip installing it." diff --git a/docs/nvim_setup_windows.ps1 b/docs/nvim_setup_windows.ps1 index c88aba9..6ca193a 100644 --- a/docs/nvim_setup_windows.ps1 +++ b/docs/nvim_setup_windows.ps1 @@ -36,19 +36,19 @@ scoop install vcredist2022 scoop install 7zip # Install lua-language-server -$sumneko_lua_link = "https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-win32-x64.zip" -$sumneko_lua_install_dir = "D:\portable_tools" -$sumneko_lua_src_dir = "$sumneko_lua_install_dir\lua-language-server.zip" -$sumneko_lua_dir = "$sumneko_lua_install_dir\lua-language-server" +$lua_ls_link = "https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-win32-x64.zip" +$lua_ls_install_dir = "D:\portable_tools" +$lua_ls_src_path = "$lua_ls_install_dir\lua-language-server.zip" +$lua_ls_dir = "$lua_ls_install_dir\lua-language-server" # Download file, ref: https://stackoverflow.com/a/51225744/6064933 -Invoke-WebRequest $sumneko_lua_link -OutFile "$sumneko_lua_src_dir" +Invoke-WebRequest $lua_ls_link -OutFile "$lua_ls_src_path" # Extract the zip file using 7zip, ref: https://stackoverflow.com/a/41933215/6064933 -7z x "$sumneko_lua_src_dir" -o"$sumneko_lua_dir" +7z x "$lua_ls_src_path" -o"$lua_ls_dir" # Setup PATH env variable, ref: https://stackoverflow.com/q/714877/6064933 -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$sumneko_lua_dir\bin", "Machine") +[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$lua_ls_dir\bin", "Machine") # Install neovim nightly scoop bucket add versions diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index 56dcc31..48253b9 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -180,8 +180,8 @@ if utils.executable("bash-language-server") then end if utils.executable("lua-language-server") then - -- settings for lua-language-server can be found on https://github.com/sumneko/lua-language-server/wiki/Settings . - lspconfig.sumneko_lua.setup { + -- settings for lua-language-server can be found on https://github.com/LuaLS/lua-language-server/wiki/Settings . + lspconfig.lua_ls.setup { on_attach = custom_attach, settings = { Lua = { @@ -195,8 +195,8 @@ if utils.executable("lua-language-server") then }, workspace = { -- Make the server aware of Neovim runtime files, - -- see also https://github.com/sumneko/lua-language-server/wiki/Libraries#link-to-workspace . - -- Lua-dev.nvim also has similar settings for sumneko lua, https://github.com/folke/lua-dev.nvim/blob/main/lua/lua-dev/sumneko.lua . + -- see also https://github.com/LuaLS/lua-language-server/wiki/Libraries#link-to-workspace . + -- Lua-dev.nvim also has similar settings for lua ls, https://github.com/folke/neodev.nvim/blob/main/lua/neodev/luals.lua . library = { fn.stdpath("data") .. "/site/pack/packer/opt/emmylua-nvim", fn.stdpath("config"),