fix(nvim/lsp): Fix kotlin-lsp root marker
This commit is contained in:
parent
4f02804419
commit
d2c8504bc4
3 changed files with 7 additions and 5 deletions
|
@ -219,7 +219,7 @@ return {
|
||||||
cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(9999)),
|
cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(9999)),
|
||||||
single_file_support = false,
|
single_file_support = false,
|
||||||
filetypes = { "kotlin" },
|
filetypes = { "kotlin" },
|
||||||
root_markers = { "build.gradle", "build.gradle.kts", "pom.xml" },
|
root_markers = { "settings.gradle", "settings.gradle.kts", "pom.xml", "build.gradle", "build.gradle.kts", "workspace.json" },
|
||||||
}
|
}
|
||||||
vim.lsp.enable("kotlin-lsp")
|
vim.lsp.enable("kotlin-lsp")
|
||||||
--#endregion
|
--#endregion
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
##region Sanity checks and "imports"
|
||||||
[ $ZI_DOTFILES ] && {
|
[ $ZI_DOTFILES ] && {
|
||||||
. $ZI_DOTFILES/common
|
. $ZI_DOTFILES/common
|
||||||
} || {
|
} || {
|
||||||
|
@ -21,9 +22,9 @@
|
||||||
[ -d $ZI_DOTFILES ] || { >&2 echo "Invalid dotfiles path, please re-run pre-bootstrap!"; exit 1; }
|
[ -d $ZI_DOTFILES ] || { >&2 echo "Invalid dotfiles path, please re-run pre-bootstrap!"; exit 1; }
|
||||||
|
|
||||||
. $ZI_DOTFILES/bootstrap-pkgs
|
. $ZI_DOTFILES/bootstrap-pkgs
|
||||||
|
##endregion
|
||||||
|
|
||||||
# === Function and Variable ===
|
##region Function and Variable
|
||||||
|
|
||||||
is_package_exists() {
|
is_package_exists() {
|
||||||
[ $(command -v "$1" | wc -l) -gt 0 ] && return 0 || return 1
|
[ $(command -v "$1" | wc -l) -gt 0 ] && return 0 || return 1
|
||||||
}
|
}
|
||||||
|
@ -95,8 +96,7 @@ install_nix() {
|
||||||
is_package_exists nix && { echo "nix is already installed, skipping..."; return; }
|
is_package_exists nix && { echo "nix is already installed, skipping..."; return; }
|
||||||
curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
|
curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
|
||||||
}
|
}
|
||||||
|
##endregion
|
||||||
# === Actual automation ===
|
|
||||||
|
|
||||||
echo "Linking x* configs..."
|
echo "Linking x* configs..."
|
||||||
ln -si $ZI_DOTFILES/.config/xinitrc $HOME/.xinitrc
|
ln -si $ZI_DOTFILES/.config/xinitrc $HOME/.xinitrc
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
. ./common
|
. ./common
|
||||||
|
|
||||||
|
##region Sanity checks
|
||||||
[ "$1" = "-" ] || {
|
[ "$1" = "-" ] || {
|
||||||
prompt 'Experimental script! Run it anyway? [y/N] ' || exit 1
|
prompt 'Experimental script! Run it anyway? [y/N] ' || exit 1
|
||||||
}
|
}
|
||||||
|
@ -11,6 +12,7 @@
|
||||||
>&2 echo "Please 'cd' to the dotfiles directory before running the script."
|
>&2 echo "Please 'cd' to the dotfiles directory before running the script."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
##endregion
|
||||||
|
|
||||||
echo_info() {
|
echo_info() {
|
||||||
echo "########################################################################"
|
echo "########################################################################"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue