Use OmniSharp directly

6 files changed, 32 insertions, 40 deletions

diff --git a/installer/install-omnisharp-node-client.cmd b/installer/install-omnisharp-node-client.cmd
deleted file mode 100644
index 7ea3a4d..0000000
--- a/installer/install-omnisharp-node-client.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\omnisharp-node-client" rd /S /Q  "..\servers\omnisharp-node-client"
-md "..\servers\omnisharp-node-client"
-cd "..\servers\omnisharp-node-client"
-git clone https://github.com/OmniSharp/omnisharp-node-client .
-
-call npm install
-call npm build
-
-echo @echo off ^
-
-node %%~dp0\languageserver\server.js ^
-
-> omnisharp-node-client.cmd
-
diff --git a/installer/install-omnisharp-node-client.sh b/installer/install-omnisharp-node-client.sh
deleted file mode 100755
index 1634fdb..0000000
--- a/installer/install-omnisharp-node-client.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd $(dirname $0)
-[ -d ../servers/omnisharp-node-client ] && rm -rf ../servers/omnisharp-node-client
-mkdir ../servers/omnisharp-node-client
-cd ../servers/omnisharp-node-client
-git clone https://github.com/OmniSharp/omnisharp-node-client .
-npm install
-npm build
-
-cat <<EOF > omnisharp-node-client
-#!/bin/sh
-
-DIR=\$(cd \$(dirname \$0); pwd)
-node \$DIR/languageserver/server.js
-EOF
-
-chmod +x omnisharp-node-client
diff --git a/installer/install-omnisharp.cmd b/installer/install-omnisharp.cmd
new file mode 100644
index 0000000..30a8375
--- /dev/null
+++ b/installer/install-omnisharp.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+cd %~dp0
+if exist "..\servers\omnisharp" rd /S /Q  "..\servers\omnisharp"
+md "..\servers\omnisharp"
+cd "..\servers\omnisharp"
+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
diff --git a/installer/install-omnisharp.sh b/installer/install-omnisharp.sh
new file mode 100644
index 0000000..a030e23
--- /dev/null
+++ b/installer/install-omnisharp.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname $0)
+[ -d ../servers/omnisharp ] && rm -rf ../servers/omnisharp
+mkdir ../servers/omnisharp
+cd ../servers/omnisharp
+curo -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
+del omnisharp-linux-x64.zip
+
+cat <<EOF > omnisharp
+#!/bin/sh
+
+DIR=\$(cd \$(dirname \$0); pwd)
+\$DIR/run \$*
+EOF
+
+chmod +x omnisharp
diff --git a/settings.json b/settings.json
index 623e122..ec5b676 100644
--- a/settings.json
+++ b/settings.json
@@ -129,7 +129,7 @@
   ],
   "cs": [
     {
-      "command": "omnisharp-node-client",
+      "command": "omnisharp",
       "requires": [
         "npm"
       ]
diff --git a/settings/omnisharp-node-client.vim b/settings/omnisharp.vim
index 4510208..2446081 100644
--- a/settings/omnisharp-node-client.vim
+++ b/settings/omnisharp.vim
@@ -1,8 +1,8 @@
 augroup vimlsp_settings_omnisharp-node-client
   au!
   autocmd User lsp_setup ++once call lsp#register_server({
-      \ 'name': 'omnisharp-node-client',
-      \ 'cmd': {server_info->lsp_settings#get('omnisharp-node-client', 'cmd', [lsp_settings#exec_path('omnisharp-node-client')])},
+      \ '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', []),