Fix formatting according to style-guide (#1057)

This commit is contained in:
kylo252 2021-08-12 11:31:31 +02:00 committed by GitHub
parent 4fd72b1be2
commit 03b7da74ee
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 213 additions and 212 deletions

View file

@ -37,7 +37,8 @@ jobs:
run: |
GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
# https://google.github.io/styleguide/shellguide.html
- name: Check formatting
run: |
shfmt -l -d .
shfmt -i 2 -ci -l -d .

View file

@ -97,7 +97,7 @@ function M.setup(filetype)
local builtin_formatter = null_ls.builtins.formatting[formatter.exe]
if not vim.tbl_contains(M.requested_providers, builtin_formatter) then
-- FIXME: why doesn't this work?
-- builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
-- builtin_formatter._opts.to_stdin = formatter.stdin or builtin_formatter._opts.to_stdin
local resolved_path = validate_provider_request(builtin_formatter)
if resolved_path then

View file

@ -8,31 +8,31 @@
# to point to the `config_mac' or `config_win` folders depending on your system.
case Darwin in
Linux)
CONFIG="$HOME/.local/share/nvim/lspinstall/java/config_linux"
;;
Darwin)
CONFIG="$HOME/.local/share/nvim/lspinstall/java/config_mac"
;;
Linux)
CONFIG="$HOME/.local/share/nvim/lspinstall/java/config_linux"
;;
Darwin)
CONFIG="$HOME/.local/share/nvim/lspinstall/java/config_mac"
;;
esac
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ]; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ]; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
@ -41,20 +41,20 @@ fi
# JAR="$HOME/.config/nvim/.language-servers/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository/plugins/org.eclipse.equinox.launcher_*.jar"
JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar"
GRADLE_HOME=$HOME/gradle "$JAVACMD" \
-Declipse.application=org.eclipse.jdt.ls.core.id1 \
-Dosgi.bundles.defaultStartLevel=4 \
-Declipse.product=org.eclipse.jdt.ls.core.product \
-Dlog.protocol=true \
-Dlog.level=ALL \
-javaagent:$HOME/.local/share/nvim/lspinstall/java/lombok.jar \
-Xms1g \
-Xmx2G \
-jar $(echo "$JAR") \
-configuration "$CONFIG" \
-data "${1:-$HOME/workspace}" \
--add-modules=ALL-SYSTEM \
--add-opens java.base/java.util=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED
-Declipse.application=org.eclipse.jdt.ls.core.id1 \
-Dosgi.bundles.defaultStartLevel=4 \
-Declipse.product=org.eclipse.jdt.ls.core.product \
-Dlog.protocol=true \
-Dlog.level=ALL \
-javaagent:$HOME/.local/share/nvim/lspinstall/java/lombok.jar \
-Xms1g \
-Xmx2G \
-jar $(echo "$JAR") \
-configuration "$CONFIG" \
-data "${1:-$HOME/workspace}" \
--add-modules=ALL-SYSTEM \
--add-opens java.base/java.util=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED
# for older java versions if you wanna use lombok
# -Xbootclasspath/a:/usr/local/share/lombok/lombok.jar \

View file

@ -6,227 +6,227 @@ set -o nounset # error when referencing undefined variable
set -o errexit # exit when command fails
installnodemac() {
brew install lua
brew install node
brew install yarn
brew install lua
brew install node
brew install yarn
}
installnodeubuntu() {
sudo apt install nodejs
sudo apt install npm
sudo apt install nodejs
sudo apt install npm
}
installnodetermux() {
apt install nodejs
apt install nodejs
}
moveoldlvim() {
echo "Not installing LunarVim"
echo "Please move your ~/.local/share/lunarvim folder before installing"
exit
echo "Not installing LunarVim"
echo "Please move your ~/.local/share/lunarvim folder before installing"
exit
}
installnodearch() {
sudo pacman -S nodejs
sudo pacman -S npm
sudo pacman -S nodejs
sudo pacman -S npm
}
installnodefedora() {
sudo dnf install -y nodejs
sudo dnf install -y npm
sudo dnf install -y nodejs
sudo dnf install -y npm
}
installnodegentoo() {
echo "Printing current node status..."
emerge -pqv net-libs/nodejs
echo "Make sure the npm USE flag is enabled for net-libs/nodejs"
echo "If it isn't enabled, would you like to enable it with flaggie? (Y/N)"
read -r answer
[ "$answer" != "${answer#[Yy]}" ] && sudo flaggie net-libs/nodejs +npm
sudo emerge -avnN net-libs/nodejs
echo "Printing current node status..."
emerge -pqv net-libs/nodejs
echo "Make sure the npm USE flag is enabled for net-libs/nodejs"
echo "If it isn't enabled, would you like to enable it with flaggie? (Y/N)"
read -r answer
[ "$answer" != "${answer#[Yy]}" ] && sudo flaggie net-libs/nodejs +npm
sudo emerge -avnN net-libs/nodejs
}
installnode() {
echo "Installing node..."
[ "$(uname)" = "Darwin" ] && installnodemac
grep -q Ubuntu /etc/os-release && installnodeubuntu
[ -f "/etc/arch-release" ] && installnodearch
[ -f "/etc/artix-release" ] && installnodearch
[ -f "/etc/fedora-release" ] && installnodefedora
[ -f "/etc/gentoo-release" ] && installnodegentoo
[ -d "/data/data/com.termux" ] && installnodetermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
sudo npm i -g neovim
echo "Installing node..."
[ "$(uname)" = "Darwin" ] && installnodemac
grep -q Ubuntu /etc/os-release && installnodeubuntu
[ -f "/etc/arch-release" ] && installnodearch
[ -f "/etc/artix-release" ] && installnodearch
[ -f "/etc/fedora-release" ] && installnodefedora
[ -f "/etc/gentoo-release" ] && installnodegentoo
[ -d "/data/data/com.termux" ] && installnodetermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
sudo npm i -g neovim
}
installpiponmac() {
sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python3 get-pip.py
rm get-pip.py
sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python3 get-pip.py
rm get-pip.py
}
installpiponubuntu() {
sudo apt install python3-pip >/dev/null
sudo apt install python3-pip >/dev/null
}
installpipontermux() {
apt install python
apt install python
}
installpiponarch() {
sudo pacman -S python-pip
sudo pacman -S python-pip
}
installpiponfedora() {
sudo dnf install -y pip >/dev/null
sudo dnf install -y pip >/dev/null
}
installpipongentoo() {
sudo emerge -avn dev-python/pip
sudo emerge -avn dev-python/pip
}
installpip() {
echo "Installing pip..."
[ "$(uname)" = "Darwin" ] && installpiponmac
grep -q Ubuntu /etc/os-release && installpiponubuntu
[ -f "/etc/arch-release" ] && installpiponarch
[ -f "/etc/fedora-release" ] && installpiponfedora
[ -f "/etc/gentoo-release" ] && installpipongentoo
[ -d "/data/data/com.termux" ] && installpipontermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
echo "Installing pip..."
[ "$(uname)" = "Darwin" ] && installpiponmac
grep -q Ubuntu /etc/os-release && installpiponubuntu
[ -f "/etc/arch-release" ] && installpiponarch
[ -f "/etc/fedora-release" ] && installpiponfedora
[ -f "/etc/gentoo-release" ] && installpipongentoo
[ -d "/data/data/com.termux" ] && installpipontermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
}
installpynvim() {
echo "Installing pynvim..."
if [ -f "/etc/gentoo-release" ]; then
echo "Installing using Portage"
sudo emerge -avn dev-python/pynvim
else
pip3 install pynvim --user
fi
echo "Installing pynvim..."
if [ -f "/etc/gentoo-release" ]; then
echo "Installing using Portage"
sudo emerge -avn dev-python/pynvim
else
pip3 install pynvim --user
fi
}
installpacker() {
git clone https://github.com/wbthomason/packer.nvim ~/.local/share/lunarvim/site/pack/packer/start/packer.nvim
git clone https://github.com/wbthomason/packer.nvim ~/.local/share/lunarvim/site/pack/packer/start/packer.nvim
}
cloneconfig() {
if [ -d "/data/data/com.termux" ]; then
sudo() {
eval "$@"
}
USER_BIN_DIR="$HOME/../usr/bin"
fi
echo "Cloning LunarVim configuration"
mkdir -p ~/.local/share/lunarvim
case "$@" in
if [ -d "/data/data/com.termux" ]; then
sudo() {
eval "$@"
}
USER_BIN_DIR="$HOME/../usr/bin"
fi
echo "Cloning LunarVim configuration"
mkdir -p ~/.local/share/lunarvim
case "$@" in
*--testing*)
cp -r "$(pwd)" ~/.local/share/lunarvim/lvim
;;
*)
git clone --branch "$LVBRANCH" https://github.com/lunarvim/lunarvim.git ~/.local/share/lunarvim/lvim
;;
esac
mkdir -p "$HOME/.config/lvim"
sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "$USER_BIN_DIR"
sudo chmod a+rx "$USER_BIN_DIR"/lvim
cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example-no-ts.lua" "$HOME/.config/lvim/config.lua"
*--testing*)
cp -r "$(pwd)" ~/.local/share/lunarvim/lvim
;;
*)
git clone --branch "$LVBRANCH" https://github.com/lunarvim/lunarvim.git ~/.local/share/lunarvim/lvim
;;
esac
mkdir -p "$HOME/.config/lvim"
sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "$USER_BIN_DIR"
sudo chmod a+rx "$USER_BIN_DIR"/lvim
cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example-no-ts.lua" "$HOME/.config/lvim/config.lua"
nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \
+'autocmd User PackerComplete sleep 100m | qall' \
+PackerInstall
nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \
+'autocmd User PackerComplete sleep 100m | qall' \
+PackerInstall
nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \
+'autocmd User PackerComplete sleep 100m | qall' \
+PackerSync
nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \
+'autocmd User PackerComplete sleep 100m | qall' \
+PackerSync
printf "\nCompile Complete\n"
printf "\nCompile Complete\n"
if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then
echo 'config.lua already present'
else
cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example.lua" "$HOME/.config/lvim/config.lua"
fi
if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then
echo 'config.lua already present'
else
cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example.lua" "$HOME/.config/lvim/config.lua"
fi
}
asktoinstallnode() {
echo "node not found"
printf "Would you like to install node now (y/n)? "
read -r answer
[ "$answer" != "${answer#[Yy]}" ] && installnode
echo "node not found"
printf "Would you like to install node now (y/n)? "
read -r answer
[ "$answer" != "${answer#[Yy]}" ] && installnode
}
asktoinstallgit() {
echo "git not found, please install git"
exit
echo "git not found, please install git"
exit
}
asktoinstallpip() {
# echo "pip not found"
# echo -n "Would you like to install pip now (y/n)? "
# read answer
# [ "$answer" != "${answer#[Yy]}" ] && installpip
echo "Please install pip3 before continuing with install"
exit
# echo "pip not found"
# echo -n "Would you like to install pip now (y/n)? "
# read answer
# [ "$answer" != "${answer#[Yy]}" ] && installpip
echo "Please install pip3 before continuing with install"
exit
}
installonmac() {
brew install ripgrep fzf
npm install -g tree-sitter-cli
brew install ripgrep fzf
npm install -g tree-sitter-cli
}
installonubuntu() {
sudo apt install ripgrep fzf
sudo apt install libjpeg8-dev zlib1g-dev python-dev python3-dev libxtst-dev
pip3 install neovim-remote
npm install -g tree-sitter-cli
sudo apt install ripgrep fzf
sudo apt install libjpeg8-dev zlib1g-dev python-dev python3-dev libxtst-dev
pip3 install neovim-remote
npm install -g tree-sitter-cli
}
installtermux() {
apt install ripgrep fzf
pip install neovim-remote
npm install -g tree-sitter-cli
apt install ripgrep fzf
pip install neovim-remote
npm install -g tree-sitter-cli
}
installonarch() {
sudo pacman -S ripgrep fzf
pip3 install neovim-remote
npm install -g tree-sitter-cli
sudo pacman -S ripgrep fzf
pip3 install neovim-remote
npm install -g tree-sitter-cli
}
installonfedora() {
sudo dnf groupinstall "X Software Development"
sudo dnf install -y fzf ripgrep
sudo dnf groupinstall "X Software Development"
sudo dnf install -y fzf ripgrep
}
installongentoo() {
sudo emerge -avn sys-apps/ripgrep app-shells/fzf dev-python/neovim-remote virtual/jpeg sys-libs/zlib
npm install -g tree-sitter-cli
sudo emerge -avn sys-apps/ripgrep app-shells/fzf dev-python/neovim-remote virtual/jpeg sys-libs/zlib
npm install -g tree-sitter-cli
}
installextrapackages() {
[ "$(uname)" = "Darwin" ] && installonmac
grep -q Ubuntu /etc/os-release && installonubuntu
[ -f "/etc/arch-release" ] && installonarch
[ -f "/etc/artix-release" ] && installonarch
[ -f "/etc/fedora-release" ] && installonfedora
[ -f "/etc/gentoo-release" ] && installongentoo
[ -d "/data/data/com.termux" ] && installtermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
[ "$(uname)" = "Darwin" ] && installonmac
grep -q Ubuntu /etc/os-release && installonubuntu
[ -f "/etc/arch-release" ] && installonarch
[ -f "/etc/artix-release" ] && installonarch
[ -f "/etc/fedora-release" ] && installonfedora
[ -f "/etc/gentoo-release" ] && installongentoo
[ -d "/data/data/com.termux" ] && installtermux
[ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported"
}
# Welcome
echo 'Installing LunarVim'
case "$@" in
*--overwrite*)
echo '!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag'
rm -rf "$HOME/.local/share/lunarvim"
rm -rf "$HOME/.cache/nvim"
rm -rf "$HOME/.config/lvim"
;;
*--overwrite*)
echo '!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag'
rm -rf "$HOME/.local/share/lunarvim"
rm -rf "$HOME/.cache/nvim"
rm -rf "$HOME/.config/lvim"
;;
esac
# move old lvim directory if it exists
@ -245,27 +245,27 @@ esac
(pip3 list | grep pynvim >/dev/null && echo "pynvim installed, moving on...") || installpynvim
if [ -e "$HOME/.local/share/lunarvim/site/pack/packer/start/packer.nvim" ]; then
echo 'packer already installed'
echo 'packer already installed'
else
installpacker
installpacker
fi
if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then
echo 'LunarVim already installed'
echo 'LunarVim already installed'
else
# clone config down
cloneconfig "$@"
# echo 'export PATH=$HOME/.config/nvim/utils/bin:$PATH' >>~/.zshrc
# echo 'export PATH=$HOME/.config/lunarvim/utils/bin:$PATH' >>~/.bashrc
# clone config down
cloneconfig "$@"
# echo 'export PATH=$HOME/.config/nvim/utils/bin:$PATH' >>~/.zshrc
# echo 'export PATH=$HOME/.config/lunarvim/utils/bin:$PATH' >>~/.bashrc
fi
if [ "$(uname)" != "Darwin" ]; then
if [ -e "$HOME/.local/share/applications/lvim.desktop" ]; then
echo 'Desktop file already available'
else
mkdir -p "$HOME/.local/share/applications"
cp "$HOME/.local/share/lunarvim/lvim/utils/desktop/lvim.desktop" "$HOME/.local/share/applications/lvim.desktop"
fi
if [ -e "$HOME/.local/share/applications/lvim.desktop" ]; then
echo 'Desktop file already available'
else
mkdir -p "$HOME/.local/share/applications"
cp "$HOME/.local/share/lunarvim/lvim/utils/desktop/lvim.desktop" "$HOME/.local/share/applications/lvim.desktop"
fi
fi
echo "I recommend you also install and activate a font from here: https://github.com/ryanoasis/nerd-fonts"

View file

@ -11,53 +11,53 @@ declare -r FILENAME="stylua-$RELEASE-$OS"
declare -a __deps=("curl" "unzip")
function check_deps() {
for dep in "${__deps[@]}"; do
if ! command -v "$dep" >/dev/null; then
echo "Missing depdendecy!"
echo "The \"$dep\" command was not found!. Please install and try again."
fi
done
for dep in "${__deps[@]}"; do
if ! command -v "$dep" >/dev/null; then
echo "Missing depdendecy!"
echo "The \"$dep\" command was not found!. Please install and try again."
fi
done
}
function download_stylua() {
local DOWNLOAD_DIR
local URL="https://github.com/JohnnyMorganz/StyLua/releases/download/v$RELEASE/$FILENAME.zip"
local DOWNLOAD_DIR
local URL="https://github.com/JohnnyMorganz/StyLua/releases/download/v$RELEASE/$FILENAME.zip"
DOWNLOAD_DIR="$(mktemp -d)"
echo "Initiating download for Stylua v$RELEASE"
if ! curl --progress-bar --fail -L "$URL" -o "$DOWNLOAD_DIR/$FILENAME.zip"; then
echo "Download failed. Check that the release/filename are correct."
exit 1
fi
DOWNLOAD_DIR="$(mktemp -d)"
echo "Initiating download for Stylua v$RELEASE"
if ! curl --progress-bar --fail -L "$URL" -o "$DOWNLOAD_DIR/$FILENAME.zip"; then
echo "Download failed. Check that the release/filename are correct."
exit 1
fi
echo "Installation in progress.."
unzip -q "$DOWNLOAD_DIR/$FILENAME.zip" -d "$DOWNLOAD_DIR"
echo "Installation in progress.."
unzip -q "$DOWNLOAD_DIR/$FILENAME.zip" -d "$DOWNLOAD_DIR"
if [ -f "$DOWNLOAD_DIR/stylua" ]; then
mv "$DOWNLOAD_DIR/stylua" "$INSTALL_DIR/stylua"
else
mv "$DOWNLOAD_DIR/$FILENAME/stylua" "$INSTALL_DIR/."
fi
if [ -f "$DOWNLOAD_DIR/stylua" ]; then
mv "$DOWNLOAD_DIR/stylua" "$INSTALL_DIR/stylua"
else
mv "$DOWNLOAD_DIR/$FILENAME/stylua" "$INSTALL_DIR/."
fi
chmod u+x "$INSTALL_DIR/stylua"
chmod u+x "$INSTALL_DIR/stylua"
}
function verify_install() {
echo "Verifying installation.."
local DOWNLOADED_VER
DOWNLOADED_VER="$("$INSTALL_DIR/stylua" -V | awk '{ print $2 }')"
if [ "$DOWNLOADED_VER" != "$RELEASE" ]; then
echo "Mismatched version!"
echo "Expected: v$RELEASE but got v$DOWNLOADED_VER"
exit 1
fi
echo "Verification complete!"
echo "Verifying installation.."
local DOWNLOADED_VER
DOWNLOADED_VER="$("$INSTALL_DIR/stylua" -V | awk '{ print $2 }')"
if [ "$DOWNLOADED_VER" != "$RELEASE" ]; then
echo "Mismatched version!"
echo "Expected: v$RELEASE but got v$DOWNLOADED_VER"
exit 1
fi
echo "Verification complete!"
}
function main() {
check_deps
download_stylua
verify_install
check_deps
download_stylua
verify_install
}
main "$@"

View file

@ -1,10 +1,10 @@
#!/bin/sh
USER_BIN_DIR="/usr/local/bin"
if [ -d "/data/data/com.termux" ]; then
sudo() {
eval "$@"
}
USER_BIN_DIR="$HOME/../usr/bin"
sudo() {
eval "$@"
}
USER_BIN_DIR="$HOME/../usr/bin"
fi
rm -rf ~/.local/share/lunarvim
sudo rm "$USER_BIN_DIR"/lvim