diff options
| author | mattn <mattn.jp@gmail.com> | 2020-03-03 10:29:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 10:29:59 +0900 |
| commit | b7317fe4ddd8ece83c3535baf7359cdf7e473848 (patch) | |
| tree | 16dd3f71ee212452aabfad66dc53825b45b21456 | |
| parent | f8882c21218280a3dfd1059b73a1c95d2652b0fb (diff) | |
| parent | cef631610c28ea34901abab44111941f48b34e86 (diff) | |
| download | vim-lsp-settings-b7317fe4ddd8ece83c3535baf7359cdf7e473848.tar.gz vim-lsp-settings-b7317fe4ddd8ece83c3535baf7359cdf7e473848.tar.bz2 vim-lsp-settings-b7317fe4ddd8ece83c3535baf7359cdf7e473848.zip | |
Merge pull request #184 from lnsf/master
Fix install-rust-analyzer.sh
| -rw-r--r-- | installer/install-ra_lsp_server.cmd | 5 | ||||
| -rwxr-xr-x | installer/install-ra_lsp_server.sh | 20 | ||||
| -rwxr-xr-x | installer/install-rust-analyzer.sh | 2 | ||||
| -rw-r--r-- | settings.json | 7 | ||||
| -rw-r--r-- | settings/ra_lsp_server.vim | 14 |
5 files changed, 1 insertions, 47 deletions
diff --git a/installer/install-ra_lsp_server.cmd b/installer/install-ra_lsp_server.cmd deleted file mode 100644 index ef40261..0000000 --- a/installer/install-ra_lsp_server.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off
-
-curl -L -o ra_lsp_server-windows.exe "https://github.com/rust-analyzer/rust-analyzer/releases/download/2020-02-11/ra_lsp_server-windows.exe"
-
-move ra_lsp_server-windows.exe ra_lsp_server.exe
diff --git a/installer/install-ra_lsp_server.sh b/installer/install-ra_lsp_server.sh deleted file mode 100755 index 4f57735..0000000 --- a/installer/install-ra_lsp_server.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -e - -os=$(uname -s | tr "[:upper:]" "[:lower:]") - -case $os in -linux) - platform="linux" - ;; -darwin) - platform="mac" - ;; -esac - -version="2020-02-11" -curl -L -o ra_lsp_server-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/$version/ra_lsp_server-$platform" - -mv ra_lsp_server-$platform ra_lsp_server -chmod +x ra_lsp_server diff --git a/installer/install-rust-analyzer.sh b/installer/install-rust-analyzer.sh index fa5a291..0f00c00 100755 --- a/installer/install-rust-analyzer.sh +++ b/installer/install-rust-analyzer.sh @@ -14,7 +14,7 @@ darwin) esac version="2020-02-24" -curl -L -o ra_lsp_server-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/$version/rust-analyzer-$platform" +curl -L -o rust-analyzer-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/$version/rust-analyzer-$platform" mv rust-analyzer-$platform rust-analyzer chmod +x rust-analyzer diff --git a/settings.json b/settings.json index 0a5c10b..024abd6 100644 --- a/settings.json +++ b/settings.json @@ -525,13 +525,6 @@ "root_uri_patterns": [ "Cargo.toml" ] - }, - { - "command": "ra_lsp_server", - "requires": [], - "root_uri_patterns": [ - "Cargo.toml" - ] } ], "sass": [ diff --git a/settings/ra_lsp_server.vim b/settings/ra_lsp_server.vim deleted file mode 100644 index 95d0272..0000000 --- a/settings/ra_lsp_server.vim +++ /dev/null @@ -1,14 +0,0 @@ -augroup vimlsp_settings_ra_lsp_server - au! - LspRegisterServer { - \ 'name': 'ra_lsp_server', - \ 'cmd': {server_info->lsp_settings#get('ra_lsp_server', 'cmd', [lsp_settings#exec_path('ra_lsp_server')])}, - \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri('ra_lsp_server'))}, - \ 'initialization_options': lsp_settings#get('ra_lsp_server', 'initialization_options', v:null), - \ 'whitelist': lsp_settings#get('ra_lsp_server', 'whitelist', ['rust']), - \ 'blacklist': lsp_settings#get('ra_lsp_server', 'blacklist', []), - \ 'config': lsp_settings#get('ra_lsp_server', 'config', lsp_settings#server_config('ra_lsp_server')), - \ 'workspace_config': lsp_settings#get('ra_lsp_server', 'workspace_config', {}), - \ 'semantic_highlight': lsp_settings#get('ra_lsp_server', 'semantic_highlight', {}), - \ } -augroup END |