change ycm to clangd

zhoupro · zhoupro · commit e8d9f8b0e2f2 · 2019-06-25T20:01:17.000+08:00
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 ### setup
 #### ubuntu
  ```bash
- ./init.sh --with_php --with_vim_c --with_vim_ycm --with_vim_go --with_java \
+ ./init.sh --with_php --with_c  --with_vim_go --with_java \
 --with_lua  --with_leetcode --with_man --with_dict --with_bash
  ```
 #### mac and centos
diff --git a/helper/option.sh b/helper/option.sh
@@ -1,6 +1,5 @@
 OPT_PHP=
-OPT_VIM_C=
-OPT_VIM_YCM=
+OPT_C=
 OPT_VIM_GO=
 OPT_JAVA=
 OPT_LUA=
@@ -15,8 +14,7 @@ for option
 do
     case "$option" in
         --with_php)                          OPT_PHP=yes                   ;;
-        --with_vim_c)                          OPT_VIM_C=yes                   ;;
-        --with_vim_ycm)                          OPT_VIM_YCM=yes                   ;;
+        --with_c)                          OPT_C=yes                   ;;
         --with_vim_go)                          OPT_VIM_GO=yes                   ;;
         --with_java)                          OPT_JAVA=yes                   ;;
         --with_lua)                          OPT_LUA=yes                   ;;
diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh
@@ -24,7 +24,27 @@ if [ "Y$OPT_DICT" == "Yyes" ];then
     fi
 fi
 
-if [ "Y$OPT_VIM_C" == "Yyes" ];then
+#install clangd8 url:https://apt.llvm.org/
+if [ "Y$OPT_C" == "Yyes" ];then
+    ! ( grep -F "llvm-toolchain-" /etc/apt/sources.list ) && \
+    cat >> /etc/apt/sources.list <<END
+    # clangd
+    # i386 not available
+    deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
+    deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
+    # 7
+    deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
+    deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
+    # 8
+    deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
+    deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
+END
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - &&\
+    apt update && apt install -y clang-tools-8 &&\
+    sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-8 100
+fi
+
+if [ "Y$OPT_C" == "Yyes" ];then
     apt-get install -y \
     valgrind clang-format cscope gdb
 fi
diff --git a/tools/neovim/ubuntu_init.sh b/tools/neovim/ubuntu_init.sh
@@ -1,32 +1,14 @@
 #!/bin/bash
-
-function ycm_ins(){
-    ! (grep -F 'YouCompleteMe' ~/.config/nvim/init.vim &>/dev/null ) && \
-    sed -i "/plug#begin/aPlug 'Valloric/YouCompleteMe'"  ~/.config/nvim/init.vim 
-
-    if [ ! -f ~/.config/nvim/ycm.cpp.py ] ; then
-        wget https://raw.githubusercontent.com/zhouzheng12/newycm_extra_conf.py/master/ycm.c.py
-        wget https://raw.githubusercontent.com/zhouzheng12/newycm_extra_conf.py/master/ycm.cpp.py
-        mkdir -p ~/.config/nvim
-        cp ycm.c.py ~/.config/nvim/ycm.c.py
-        cp ycm.cpp.py ~/.config/nvim/ycm.cpp.py
-        rm -f ycm.c.py ycm.cpp.py
-    fi
-    if [ ! -f ~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.so ] ; then
-        bash ~/.config/nvim/add_swap.sh
-        pxy python2  ~/.local/share/nvim/plugged/YouCompleteMe/install.py --clang-completer
-        bash ~/.config/nvim/del_swap.sh
-        rm -rf  ~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/clang_archives
-    fi
-}
-
 function c_ins(){
     ! (grep -F 'nvim-gdb' ~/.config/nvim/init.vim &>/dev/null ) && \
     sed -i "/plug#begin/aPlug 'vim-scripts/a.vim'" ~/.config/nvim/init.vim && \
     sed -i "/plug#begin/aPlug 'gauteh/vim-cppman'" ~/.config/nvim/init.vim && \
     sed -i "/plug#begin/aPlug 'rhysd/vim-clang-format'" ~/.config/nvim/init.vim && \
     sed -i "/plug#begin/aPlug 'sakhnik/nvim-gdb' , { 'branch': 'legacy' }" ~/.config/nvim/init.vim
+    ! ( grep -F "languageserver" ~/.config/nvim/coc-settings.json ) && \
+        sed -i '/suggest.timeout/i  "languageserver": { \n "clangd": { \n "command": "clangd",\n"filetypes": ["c", "cpp", "objc", "objcpp"],\n"args": ["-background-index"]\n }\n },'
 }
+
 function leetcode_ins(){
     ! (grep -F 'leetcode' ~/.config/nvim/init.vim &>/dev/null ) && \
     pip3 install requests beautifulsoup4 && \
@@ -141,13 +123,10 @@ if [ "Y$OPT_PHP" == "Yyes" ];then
     php_ins
 fi
 
-if [ "Y$OPT_VIM_C" == "Yyes" ];then
+if [ "Y$OPT_C" == "Yyes" ];then
     c_ins
 fi
 
-if [ "Y$OPT_VIM_YCM" == "Yyes" ];then
-    ycm_ins
-fi
 
 if [ "Y$OPT_LUA" == "Yyes" ];then
     lua_ins
