diff options
| -rw-r--r-- | installer/install-omnisharp-lsp.cmd (renamed from installer/install-omnisharp.cmd) | 8 | ||||
| -rwxr-xr-x | installer/install-omnisharp-lsp.sh (renamed from installer/install-omnisharp.sh) | 10 | ||||
| -rw-r--r-- | settings.json | 2 | ||||
| -rw-r--r-- | settings/omnisharp-lsp.vim | 12 | ||||
| -rw-r--r-- | settings/omnisharp.vim | 12 |
5 files changed, 22 insertions, 22 deletions
diff --git a/installer/install-omnisharp.cmd b/installer/install-omnisharp-lsp.cmd index 38b6dc9..253936a 100644 --- a/installer/install-omnisharp.cmd +++ b/installer/install-omnisharp-lsp.cmd @@ -1,9 +1,9 @@ @echo off cd %~dp0 -if exist "..\servers\omnisharp" rd /S /Q "..\servers\omnisharp" -md "..\servers\omnisharp" -cd "..\servers\omnisharp" +if exist "..\servers\omnisharp-lsp" rd /S /Q "..\servers\omnisharp-lsp" +md "..\servers\omnisharp-lsp" +cd "..\servers\omnisharp-lsp" curl -L -o omnisharp-win-x64.zip "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-win-x64.zip" unzip omnisharp-win-x64.zip del omnisharp-win-x64.zip @@ -12,4 +12,4 @@ echo @echo off ^ %%~dp0\omnisharp.exe %%* ^ -> omnisharp-run.cmd +> omnisharp-lsp.cmd diff --git a/installer/install-omnisharp.sh b/installer/install-omnisharp-lsp.sh index ea8916c..7f2c35c 100755 --- a/installer/install-omnisharp.sh +++ b/installer/install-omnisharp-lsp.sh @@ -3,18 +3,18 @@ set -e cd $(dirname $0) -[ -d ../servers/omnisharp ] && rm -rf ../servers/omnisharp -mkdir ../servers/omnisharp -cd ../servers/omnisharp +[ -d ../servers/omnisharp-lsp ] && rm -rf ../servers/omnisharp-lsp +mkdir ../servers/omnisharp-lsp +cd ../servers/omnisharp-lsp curl -L -o omnisharp-linux-x64.zip https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-linux-x64.zip unzip omnisharp-linux-x64.zip rm omnisharp-linux-x64.zip -cat <<EOF > omnisharp-run +cat <<EOF > omnisharp-lsp #!/bin/sh DIR=\$(cd \$(dirname \$0); pwd) \$DIR/run \$* EOF -chmod +x omnisharp-run +chmod +x omnisharp-lsp diff --git a/settings.json b/settings.json index 40e500c..b453245 100644 --- a/settings.json +++ b/settings.json @@ -129,7 +129,7 @@ ], "cs": [ { - "command": "omnisharp-run", + "command": "omnisharp-lsp", "requires": [ "npm" ] diff --git a/settings/omnisharp-lsp.vim b/settings/omnisharp-lsp.vim new file mode 100644 index 0000000..5e85335 --- /dev/null +++ b/settings/omnisharp-lsp.vim @@ -0,0 +1,12 @@ +augroup vimlsp_settings_omnisharp_lsp + au! + autocmd User lsp_setup ++once call lsp#register_server({ + \ 'name': 'omnisharp-lsp', + \ 'cmd': {server_info->lsp_settings#get('omnisharp-lsp', 'cmd', [lsp_settings#exec_path('omnisharp'), '-lsp'])}, + \ 'initialization_options': lsp_settings#get('omnisharp-lsp', 'initialization_options', v:null), + \ 'whitelist': lsp_settings#get('omnisharp-lsp', 'whitelist', ['cs']), + \ 'blacklist': lsp_settings#get('omnisharp-lsp', 'blacklist', []), + \ 'config': lsp_settings#get('omnisharp-lsp', 'config', {}), + \ 'workspace_config': lsp_settings#get('omnisharp-lsp', 'workspace_config', {}), + \ }) +augroup END diff --git a/settings/omnisharp.vim b/settings/omnisharp.vim deleted file mode 100644 index 2446081..0000000 --- a/settings/omnisharp.vim +++ /dev/null @@ -1,12 +0,0 @@ -augroup vimlsp_settings_omnisharp-node-client - au! - autocmd User lsp_setup ++once call lsp#register_server({ - \ 'name': 'omnisharp', - \ 'cmd': {server_info->lsp_settings#get('omnisharp-node-client', 'cmd', [lsp_settings#exec_path('omnisharp'), '-lsp'])}, - \ 'initialization_options': lsp_settings#get('omnisharp-node-client', 'initialization_options', v:null), - \ 'whitelist': lsp_settings#get('omnisharp-node-client', 'whitelist', ['cs']), - \ 'blacklist': lsp_settings#get('omnisharp-node-client', 'blacklist', []), - \ 'config': lsp_settings#get('omnisharp-node-client', 'config', {}), - \ 'workspace_config': lsp_settings#get('omnisharp-node-client', 'workspace_config', {}), - \ }) -augroup END |