From 6508d40ec1a126d39749ebcd356e9e7d243b95d9 Mon Sep 17 00:00:00 2001 From: shirokuro <46kuro212@gmail.com> Date: Thu, 26 Dec 2019 00:40:29 +0900 Subject: Fix Rust integration --- README.md | 2 +- installer/install-rls.cmd | 15 --------------- installer/install-rls.sh | 11 ----------- settings.json | 4 +--- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 installer/install-rls.cmd delete mode 100755 installer/install-rls.sh diff --git a/README.md b/README.md index 836859a..154cc32 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Currently, no way to uninstall/update server. Run this command again, newer vers | TypeScript | typescript-language-server | Yes | | JavaScript | javascript-typescript-langserver/typescript-language-server | Yes | | Python | pyls | Yes | -| Rust | rls | Yes | +| Rust | rls | No | | Go | gopls | Yes | | Ruby | solargraph | Yes | | PHP | intelephense | Yes | diff --git a/installer/install-rls.cmd b/installer/install-rls.cmd deleted file mode 100644 index eb7900a..0000000 --- a/installer/install-rls.cmd +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -setlocal - -cd %~dp0 -if exist "..\servers\rls" rd /S /Q "..\servers\rls" -md "..\servers\rls" -cd "..\servers\rls" -set CARGO_HOME=%cd% -cargo install rls -copy bin\rls.exe . -rd /S /Q "bin" -rd /S /Q "registry" -del .package-cache -del .crates.toml diff --git a/installer/install-rls.sh b/installer/install-rls.sh deleted file mode 100755 index ab310ff..0000000 --- a/installer/install-rls.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) -[ -d ../servers/rls ] && rm -rf ../servers/rls -mkdir ../servers/rls -cd ../servers/rls -CARGO_HOME=$(pwd) cargo install rls -cp bin/rls . -rm -rf bin registry .package-cache .crates.toml diff --git a/settings.json b/settings.json index 992d02d..8081274 100644 --- a/settings.json +++ b/settings.json @@ -50,9 +50,7 @@ "rust": [ { "command": "rls", - "requires": [ - "rustup" - ] + "requires": [] } ], "go": [ -- cgit v1.2.3-54-g00ecf From 1c0320ac06ee04bfe564f0490eae25c63bf41084 Mon Sep 17 00:00:00 2001 From: shirokuro <46kuro212@gmail.com> Date: Thu, 26 Dec 2019 01:32:43 +0900 Subject: Add install instruction for rls --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 154cc32..b6b350e 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ Plug 'mattn/vim-lsp-settings' ## Usage +If you install rls already, you can use rls without configurations. But if you not installed rls yet, you can install it by following [this instruction](https://github.com/rust-lang/rls#setup). + If you install clangd already, you can use clangd for C/C++ without configurations. But if you install clang with named clangd-6.0, you can replace executable like below: ```vim -- cgit v1.2.3-54-g00ecf