From 91ad6b301f156a827fcb1516c2228c24b7b309ce Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 25 Dec 2019 17:12:46 +0900
Subject: Rename to intelephense

---
 installer/install-intelephense-server.cmd | 16 ----------------
 installer/install-intelephense-server.sh  | 20 --------------------
 installer/install-intelephense.cmd        |  5 +++++
 installer/install-intelephense.sh         |  8 ++++++++
 settings.json                             |  2 +-
 settings/intelephense-server.vim          | 12 ------------
 settings/intelephense.vim                 | 12 ++++++++++++
 7 files changed, 26 insertions(+), 49 deletions(-)
 delete mode 100644 installer/install-intelephense-server.cmd
 delete mode 100755 installer/install-intelephense-server.sh
 create mode 100644 installer/install-intelephense.cmd
 create mode 100755 installer/install-intelephense.sh
 delete mode 100644 settings/intelephense-server.vim
 create mode 100644 settings/intelephense.vim

diff --git a/installer/install-intelephense-server.cmd b/installer/install-intelephense-server.cmd
deleted file mode 100644
index efa690e..0000000
--- a/installer/install-intelephense-server.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\intelephense-server" rd /S /Q  "..\servers\intelephense-server"
-md "..\servers\intelephense-server"
-cd "..\servers\intelephense-server"
-git clone "https://github.com/bmewburn/vscode-intelephense" .
-
-call npm install
-
-echo @echo off ^
-
-call %%~dp0\node_modules\.bin\intelephense.cmd %%* ^
-
-> intelephense-server.cmd
-
diff --git a/installer/install-intelephense-server.sh b/installer/install-intelephense-server.sh
deleted file mode 100755
index 60c400a..0000000
--- a/installer/install-intelephense-server.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-[ -d ../servers/intelephense-server ] && rm -rf ../servers/intelephense-server
-mkdir ../servers/intelephense-server
-cd ../servers/intelephense-server
-git clone "https://github.com/bmewburn/vscode-intelephense" .
-npm install
-npm run compile
-
-cat <<EOF > intelephense-server
-#!/bin/sh
-
-DIR=\$(cd \$(dirname \$0); pwd)
-\$DIR/node_modules/.bin/intelephense --stdio
-EOF
-
-chmod +x intelephense-server
diff --git a/installer/install-intelephense.cmd b/installer/install-intelephense.cmd
new file mode 100644
index 0000000..72e55c7
--- /dev/null
+++ b/installer/install-intelephense.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+cd %~dp0
+
+call npm_install intelephense intelephense
diff --git a/installer/install-intelephense.sh b/installer/install-intelephense.sh
new file mode 100755
index 0000000..4b24254
--- /dev/null
+++ b/installer/install-intelephense.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ./npm.sh
+npm_install intelephense intelephense
diff --git a/settings.json b/settings.json
index 83cb3b5..c679dbd 100644
--- a/settings.json
+++ b/settings.json
@@ -73,7 +73,7 @@
   ],
   "php": [
     {
-      "command": "intelephense-server",
+      "command": "intelephense",
       "requires": [
         "npm"
       ]
diff --git a/settings/intelephense-server.vim b/settings/intelephense-server.vim
deleted file mode 100644
index 5c0f79c..0000000
--- a/settings/intelephense-server.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-augroup vimlsp_settings_intelephense_server
-  au!
-  LspRegisterServer {
-      \ 'name': 'intelephense',
-      \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense-server'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
-      \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']),
-      \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []),
-      \ 'config': lsp_settings#get('intelephense', 'config', {}),
-      \ 'workspace_config': lsp_settings#get('intelephense', 'workspace_config', {}),
-      \ }
-augroup END
diff --git a/settings/intelephense.vim b/settings/intelephense.vim
new file mode 100644
index 0000000..e57a3e3
--- /dev/null
+++ b/settings/intelephense.vim
@@ -0,0 +1,12 @@
+augroup vimlsp_settings_intelephense_server
+  au!
+  LspRegisterServer {
+      \ 'name': 'intelephense',
+      \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense'), '--stdio'])},
+      \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']),
+      \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []),
+      \ 'config': lsp_settings#get('intelephense', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('intelephense', 'workspace_config', {}),
+      \ }
+augroup END
-- 
cgit v1.2.3-54-g00ecf