Skip to content

Commit 584adf3

Browse files
zhouprozhoupro
committed
fix
1 parent f302ad7 commit 584adf3

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

‎helper/option.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
OPT_VIM_PHP=
1+
OPT_PHP=
22
OPT_VIM_C=
33
OPT_VIM_YCM=
4-
OPT_VIM_LUA=
54
OPT_VIM_GO=
65
OPT_JAVA=
76
OPT_LUA=
@@ -15,10 +14,9 @@ OPT_FE=
1514
for option
1615
do
1716
case "$option" in
18-
--with_vim_php) OPT_VIM_PHP=yes ;;
17+
--with_php) OPT_PHP=yes ;;
1918
--with_vim_c) OPT_VIM_C=yes ;;
2019
--with_vim_ycm) OPT_VIM_YCM=yes ;;
21-
--with_vim_lua) OPT_VIM_LUA=yes ;;
2220
--with_vim_go) OPT_VIM_GO=yes ;;
2321
--with_java) OPT_JAVA=yes ;;
2422
--with_lua) OPT_LUA=yes ;;

‎tools/dep/ubuntu_init.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ if [ "Y$OPT_PHP" == "Yyes" ];then
4141
apt-get install -y npm
4242
npm i -g intelephense
4343
fi
44-
if [ "Y$OPT_PYTHON" == "Yyes" ];then
45-
pip install python-language-server
46-
fi
44+
45+
pip install python-language-server
4746

4847
if [ "Y$OPT_LUA" == "Yyes" ];then
4948
apt install lua5.3-dev luarocks lua5.3

‎tools/neovim/init.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ let g:LanguageClient_diagnosticsEnable = 0
8383
call deoplete#custom#option('sources', {
8484
\ 'sh': []})
8585
let g:LanguageClient_serverCommands = {
86+
\ 'python': ['pyls'],
8687
\ }
8788

8889
" <TAB>: completion.

‎tools/neovim/ubuntu_init.sh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,25 @@ function leetcode_ins(){
3434
}
3535

3636
function python_ins(){
37-
! (grep -F 'pyls' ~/.config/nvim/init.vim &>/dev/null ) && \
38-
sed -i "/LanguageClient_serverCommands/a\ 'python': ['pyls']," ~/.config/nvim/init.vim
37+
echo "python ins"
3938
}
4039
function java_ins(){
4140
! (grep -F 'jdtls' ~/.config/nvim/init.vim &>/dev/null ) && \
42-
sed -i "/LanguageClient_serverCommands/a \ 'java': ['/usr/local/bin/jdtls', '-data', getcwd()]," ~/.config/nvim/init.vim
41+
sed -i "/LanguageClient_serverCommands/a \\ 'java': ['/usr/local/bin/jdtls', '-data', getcwd()]," ~/.config/nvim/init.vim
4342
}
4443
function lua_ins(){
4544
! (grep -F 'lua-lsp' ~/.config/nvim/init.vim &>/dev/null ) && \
46-
sed -i "/LanguageClient_serverCommands/a \ 'lua': ['lua-lsp']," ~/.config/nvim/init.vim
45+
sed -i "/LanguageClient_serverCommands/a \\ 'lua': ['lua-lsp']," ~/.config/nvim/init.vim
4746
}
4847
function fe_ins(){
4948
! (grep -F 'typescript-language-server' ~/.config/nvim/init.vim &>/dev/null ) && \
50-
sed -i "/LanguageClient_serverCommands/a \ 'css': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
51-
sed -i "/LanguageClient_serverCommands/a \ 'less': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
52-
sed -i "/LanguageClient_serverCommands/a \ 'sass': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
53-
sed -i "/LanguageClient_serverCommands/a \ 'javascript': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
54-
sed -i "/LanguageClient_serverCommands/a \ 'javascript.jsx': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
55-
sed -i "/LanguageClient_serverCommands/a \ 'typescript': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
56-
sed -i "/LanguageClient_serverCommands/a \ 'typescript.tsx': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim
49+
sed -i "/LanguageClient_serverCommands/a \\ 'css': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
50+
sed -i "/LanguageClient_serverCommands/a \\ 'less': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
51+
sed -i "/LanguageClient_serverCommands/a \\ 'sass': ['css-languageserver', '--stdio']," ~/.config/nvim/init.vim && \
52+
sed -i "/LanguageClient_serverCommands/a \\ 'javascript': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
53+
sed -i "/LanguageClient_serverCommands/a \\ 'javascript.jsx': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
54+
sed -i "/LanguageClient_serverCommands/a \\ 'typescript': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim && \
55+
sed -i "/LanguageClient_serverCommands/a \\ 'typescript.tsx': ['typescript-language-server', '--stdio']," ~/.config/nvim/init.vim
5756
}
5857

5958
function go_ins(){
@@ -73,7 +72,7 @@ function go_ins(){
7372
function php_ins(){
7473
! (grep -F 'arnaud-lb/vim-php-namespace' ~/.config/nvim/init.vim &>/dev/null ) && \
7574
sed -i "/plug#begin/aPlug 'stephpy/vim-php-cs-fixer'" ~/.config/nvim/init.vim && \
76-
sed -i "/LanguageClient_serverCommands/a\ 'php': ['node', '/usr/local/lib/node_modules/intelephense/lib/intelephense.js', '--stdio']," ~/.config/nvim/init.vim && \
75+
sed -i "/LanguageClient_serverCommands/a\\ 'php': ['node', '/usr/local/lib/node_modules/intelephense/lib/intelephense.js', '--stdio']," ~/.config/nvim/init.vim && \
7776
sed -i "/plug#begin/aPlug 'vim-vdebug/vdebug'" ~/.config/nvim/init.vim
7877
cat > /usr/local/bin/phpxd <<END
7978
#!/bin/zsh
@@ -142,7 +141,7 @@ if [ "Y$OPT_VIM_GO" == "Yyes" ];then
142141
go_ins
143142
fi
144143

145-
if [ "Y$OPT_VIM_PHP" == "Yyes" ];then
144+
if [ "Y$OPT_PHP" == "Yyes" ];then
146145
php_ins
147146
fi
148147

0 commit comments

Comments
 (0)