Merge branch 'main' into main

This commit is contained in:
jaydamani 2021-03-31 18:21:01 +05:30 committed by GitHub
commit 3b85cd77fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions

View file

@ -2,7 +2,7 @@
BASE=$(git rev-parse --show-toplevel) BASE=$(git rev-parse --show-toplevel)
LSP_BIN_PATH=$HOME/.local/bin LSP_BIN_PATH=$HOME/.local/bin
default_lsp_langs="css html ts rust" default_lsp_langs="css html ts rust python"
lsp_langs=${@:-"$default_lsp_langs"} lsp_langs=${@:-"$default_lsp_langs"}
pfx="~~~~~ " pfx="~~~~~ "
@ -63,6 +63,14 @@ install_node_deps () {
sudo npm install -g $@ sudo npm install -g $@
} }
install_python_deps () {
if [[ -z $(which pip) ]]; then
echo "python/pip not installed"
return
fi
sudo python3 -m pip install $@
}
install_ts() { install_ts() {
install_node_deps typescript typescript-language-server prettier install_node_deps typescript typescript-language-server prettier
} }
@ -86,6 +94,10 @@ install_rust() {
fi fi
} }
install_python(){
install_python_deps 'python-language-server[all]'
}
for lang in ${lsp_langs}; do for lang in ${lsp_langs}; do
if fn_exists install_$lang ; then if fn_exists install_$lang ; then
heading "Installing $lang language server" heading "Installing $lang language server"

View file

@ -36,9 +36,7 @@ function on_attach(client)
end end
local servers = { "tsserver" } local servers = { "tsserver", "cssls", "pyls", "html" }
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { on_attach = on_attach } nvim_lsp[lsp].setup { on_attach = on_attach }
end end