From eae0e7044ceff95f34ba4cf54447d936daea3f2e Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sat, 31 Aug 2019 16:35:55 +0800
Subject: [PATCH 001/176] use python2.7
---
.vimrc | 2 +-
README.md | 4 ----
install.sh | 6 +++---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.vimrc b/.vimrc
index 38a857f8..4923b46a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -248,7 +248,7 @@ let g:ycm_warning_symbol = '✹'
let g:ycm_seed_identifiers_with_syntax = 1
let g:ycm_complete_in_comments = 1
let g:ycm_complete_in_strings = 1
-let g:ycm_server_python_interpreter = '/usr/bin/python'
+let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
let g:ycm_python_binary_path = 'python'
nnoremap u :YcmCompleter GoToDeclaration
" 已经使用cpp-mode插件提供的转到函数实现的功能
diff --git a/README.md b/README.md
index 1d07c924..0ad92404 100644
--- a/README.md
+++ b/README.md
@@ -170,10 +170,6 @@ An automatic configuration program for vim
vimplus使用vim-plug作为插件管理器,vim-plug可能由于界面没有刷新(其实在安装),所以进度一直停留在`Installing plugins (24/40)`,用户只需要耐心等待所有插件安装完成即可,或者直接`Ctrl+C`终止安装,通过vim打开`~/.vimrc`并执行`:PlugInstall`命令安装剩余插件。
-- **`The ycmd server SHUT DOWN (restart with ':YcmRestartServer'). YCM core library compiled for Python 3 but loaded in Python 2. Set the 'g:ycm_server_python_interpreter' option to a Python 3 interpreter path`**
-
- 编译ycm和运行ycmd server的python版本不一致导致的,比如说,编译ycm时使用系统默认版本python3,后来又将系统默认版本改为python2,解决该问题有三种方法,第一:编辑.vimrc,将g:ycm_server_python_interpreter指向编译ycm时的python版本,第二:使用当前python版本重新编译ycm,第三:恢复系统默认的python版本。
-
- **`vimplus不支持目前用户正在使用的系统怎么办?`**
可以给作者提[Issues][39],或者自己fork vimplus来修改,并提交pr,贡献自己的一份力量。
diff --git a/install.sh b/install.sh
index c0bd5600..eb148186 100755
--- a/install.sh
+++ b/install.sh
@@ -245,14 +245,14 @@ function install_ycm_on_linux()
git clone https://gitee.com/chxuan/YouCompleteMe_linux_with_clang.git ~/.vim/plugged/YouCompleteMe
cd ~/.vim/plugged/YouCompleteMe
- ./install.py --clang-completer
+ python2.7 ./install.py --clang-completer
}
# macos编译ycm, 原始方法
function compile_ycm_on_mac_legacy()
{
cd ~/.vim/plugged/YouCompleteMe
- ./install.py --clang-completer --system-libclang
+ python2.7 ./install.py --clang-completer --system-libclang
}
# macos编译ycm, Mojave上的方法
@@ -262,7 +262,7 @@ function compile_ycm_on_mac_mojave()
xcode-select --install
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
cd ~/.vim/plugged/YouCompleteMe
- ./install.py --clang-completer
+ python2.7 ./install.py --clang-completer
}
# 在MacOS上安装ycm插件
From 2eef7068fe744d65657731b3cff34d4b75f52c53 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sat, 31 Aug 2019 17:19:05 +0800
Subject: [PATCH 002/176] update vimrc
---
.vimrc | 1 -
1 file changed, 1 deletion(-)
diff --git a/.vimrc b/.vimrc
index 4923b46a..78e899e1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -249,7 +249,6 @@ let g:ycm_seed_identifiers_with_syntax = 1
let g:ycm_complete_in_comments = 1
let g:ycm_complete_in_strings = 1
let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
-let g:ycm_python_binary_path = 'python'
nnoremap u :YcmCompleter GoToDeclaration
" 已经使用cpp-mode插件提供的转到函数实现的功能
" nnoremap i :YcmCompleter GoToDefinition
From 505f97eaa7621adba02dceafc14cd3ba42d30960 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sun, 1 Sep 2019 17:17:48 +0800
Subject: [PATCH 003/176] update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0ad92404..58374943 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ An automatic configuration program for vim
## 快捷键
-以下是部分快捷键,更详细的快捷键请查阅[vimplus帮助文档][59]。
+以下是部分快捷键,可通过vimplus的`,h`命令查看[vimplus帮助文档][59]。
| 快捷键 | 说明 |
| ------- | ----- |
From 49644129fd6ea9275d335a4b6bf090012eaa41a1 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Fri, 6 Sep 2019 16:42:06 +0800
Subject: [PATCH 004/176] update install.sh
---
install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install.sh b/install.sh
index eb148186..88d2323e 100755
--- a/install.sh
+++ b/install.sh
@@ -262,7 +262,7 @@ function compile_ycm_on_mac_mojave()
xcode-select --install
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer
+ python2.7 ./install.py --clang-completer --system-libclang
}
# 在MacOS上安装ycm插件
From 06d61303a3cdc2b3fcc8ac368bf1be04c9a888ac Mon Sep 17 00:00:00 2001
From: xuthus <1397190480@qq.com>
Date: Thu, 12 Sep 2019 13:51:18 +0800
Subject: [PATCH 005/176] feat:Support Fedora
---
install.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/install.sh b/install.sh
index 88d2323e..cce5dd5a 100755
--- a/install.sh
+++ b/install.sh
@@ -21,6 +21,8 @@ function get_linux_distro()
echo "Debian"
elif grep -Eq "CentOS" /etc/*-release; then
echo "CentOS"
+ elif grep -Eq "fedora" /etc/*-release; then
+ echo "fedora"
elif grep -Eq "openSUSE" /etc/*-release; then
echo "openSUSE"
elif grep -Eq "Arch Linux" /etc/*-release; then
@@ -177,6 +179,12 @@ function install_prepare_software_on_centos()
compile_vim_on_centos
}
+# 安装fedora必要软件
+function install_prepare_software_on_fedora()
+{
+ sudo dnf install -y ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
+}
+
# 安装archlinux必要软件
function install_prepare_software_on_archlinux()
{
@@ -344,6 +352,13 @@ function install_vimplus_on_centos()
begin_install_vimplus
}
+# 在fedora上安装vimplus
+function install_vimplus_on_fedora()
+{
+ install_prepare_software_on_fedora
+ begin_install_vimplus
+}
+
# 在archlinux上安装vimplus
function install_vimplus_on_archlinux()
{
@@ -376,6 +391,8 @@ function install_vimplus_on_linux()
install_vimplus_on_debian
elif [ ${distro} == "CentOS" ]; then
install_vimplus_on_centos
+ elif [ ${distro} == "fedora" ]; then
+ install_vimplus_on_fedora
elif [ ${distro} == "openSUSE" ]; then
install_vimplus_on_opensuse
elif [ ${distro} == "ArchLinux" ]; then
From 733ff354289c2948411b8c7ddeeddd63fd00af99 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 16 Sep 2019 11:39:31 +0800
Subject: [PATCH 006/176] support fedora
---
README.md | 3 ++-
install.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 58374943..e175b1b8 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@ An automatic configuration program for vim
-
@@ -43,6 +42,7 @@ An automatic configuration program for vim
 |
 |
 |
+ |
 |
 |
 |
@@ -231,6 +231,7 @@ An automatic configuration program for vim
 Shaloc |
 jokerkeny |
+ xuthus5 |
diff --git a/install.sh b/install.sh
index cce5dd5a..13067828 100755
--- a/install.sh
+++ b/install.sh
@@ -182,7 +182,7 @@ function install_prepare_software_on_centos()
# 安装fedora必要软件
function install_prepare_software_on_fedora()
{
- sudo dnf install -y ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
+ sudo dnf install -y vim ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
}
# 安装archlinux必要软件
From 71518de361dfbd91fa4b496008eeda76fb2a69a6 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 16 Sep 2019 11:45:55 +0800
Subject: [PATCH 007/176] update readme
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index e175b1b8..09bd037b 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ An automatic configuration program for vim
+
From 655d3d95be5162cb6010787fe11c21679b576f32 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 16 Sep 2019 11:47:12 +0800
Subject: [PATCH 008/176] update code
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 09bd037b..cafa1f48 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An automatic configuration program for vim
-
+
From 9b83720e2988e97758df6d7898a6ab0dd3f9c6cb Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 16 Sep 2019 13:40:11 +0800
Subject: [PATCH 009/176] update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cafa1f48..be957567 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An automatic configuration program for vim
-
+
From 8f7479e4608be4c7703b77944e45ffdfb8812779 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 23 Sep 2019 18:11:14 +0800
Subject: [PATCH 010/176] support kali
---
README.md | 5 ++++-
install.sh | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index be957567..bd55fa50 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,11 @@ An automatic configuration program for vim
 |
 |
 |
+ |
 |
 |
+
+
 |
 |
 |
@@ -51,7 +54,7 @@ An automatic configuration program for vim
-#### 安装vimplus(请在普通用户下安装)
+#### 安装vimplus
git clone https://github.com/chxuan/vimplus.git ~/.vimplus
cd ~/.vimplus
diff --git a/install.sh b/install.sh
index 13067828..906dee5f 100755
--- a/install.sh
+++ b/install.sh
@@ -19,6 +19,8 @@ function get_linux_distro()
echo "elementaryOS"
elif grep -Eq "Debian" /etc/*-release; then
echo "Debian"
+ elif grep -Eq "Kali" /etc/*-release; then
+ echo "Kali"
elif grep -Eq "CentOS" /etc/*-release; then
echo "CentOS"
elif grep -Eq "fedora" /etc/*-release; then
@@ -389,6 +391,8 @@ function install_vimplus_on_linux()
install_vimplus_on_ubuntu
elif [ ${distro} == "Debian" ]; then
install_vimplus_on_debian
+ elif [ ${distro} == "Kali" ]; then
+ install_vimplus_on_debian
elif [ ${distro} == "CentOS" ]; then
install_vimplus_on_centos
elif [ ${distro} == "fedora" ]; then
From 876023a483772fabf1315a9d0a1d0ab820db2d8f Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 23 Sep 2019 18:14:45 +0800
Subject: [PATCH 011/176] update readme
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index bd55fa50..2e645ea2 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,12 @@ An automatic configuration program for vim
 |
 |
 |
-
-
 |
 |
 |
 |
+
+
 |
 |
From 2e5421f9d50b608f7fa232c89f5a1cb488eb94e3 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 23 Sep 2019 22:32:49 +0800
Subject: [PATCH 012/176] update ycm config
---
.ycm_extra_conf.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index bda4afae..e037d00a 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -75,6 +75,8 @@
'-isystem',
'/usr/include/c++/8',
'-isystem',
+'/usr/include/c++/9',
+'-isystem',
'/usr/include/c++/9.1.0',
'-isystem',
'/usr/include',
From b9556cd8424a1c6147efd22ad49825dd22747c12 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 23 Sep 2019 23:00:07 +0800
Subject: [PATCH 013/176] update vimrc
---
.vimrc | 1 -
README.md | 2 --
help.md | 1 -
3 files changed, 4 deletions(-)
diff --git a/.vimrc b/.vimrc
index 78e899e1..c9af8b75 100644
--- a/.vimrc
+++ b/.vimrc
@@ -146,7 +146,6 @@ Plug 'sgur/vim-textobj-parameter'
Plug 'Shougo/echodoc.vim'
Plug 'terryma/vim-smooth-scroll'
Plug 'rhysd/clever-f.vim'
-Plug 'rhysd/github-complete.vim'
Plug 'vim-scripts/indentpython.vim'
call plug#end()
diff --git a/README.md b/README.md
index 2e645ea2..a46a17d6 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,6 @@ An automatic configuration program for vim
| [echodoc][57] | 补全函数时在命令栏显示函数签名 |
| [vim-smooth-scroll][60] | 让翻页更顺畅 |
| [clever-f.vim][68] | 强化f和F键 |
-| [github-complete.vim][69] | Emoji:dog:补全 |
## 快捷键
@@ -291,7 +290,6 @@ This software is licensed under the [MIT license][75]. © 2016 chxuan
[66]: https://github.com/chxuan/vimplus-startify
[67]: https://github.com/chxuan/prepare-code
[68]: https://github.com/rhysd/clever-f.vim
- [69]: https://github.com/rhysd/github-complete.vim
[70]: https://github.com/chxuan/vim-buffer
[72]: https://github.com/chxuan/vim-edit
[74]: https://github.com/chxuan/tagbar
diff --git a/help.md b/help.md
index 049ae943..981ba78d 100644
--- a/help.md
+++ b/help.md
@@ -45,7 +45,6 @@
| `daf` | 删除函数内容(包括函数名 花括号) |
| `caf` | 改写函数内容(包括函数名 花括号) |
| `fa` | 查找字母a,然后再按f键查找下一个 |
-| `` | Emoji:dog:补全 |
## 插入模式
From d4fe4f2d8ba18af11f866f7e43b0a585d22f54b1 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 25 Sep 2019 00:45:07 -0700
Subject: [PATCH 014/176] multi-user support
---
README.md | 11 +--
install_to_user.sh | 167 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 174 insertions(+), 4 deletions(-)
create mode 100755 install_to_user.sh
diff --git a/README.md b/README.md
index a46a17d6..967922f7 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,13 @@ An automatic configuration program for vim
为防止vimplus显示乱码,需设置linux终端字体为`Droid Sans Mono Nerd Font`。
+#### 多用户支持
+
+将vimplus在某个用户下安装好后,若需要在其他用户也能够使用vimplus,则执行
+
+ sudo ./install_to_user.sh username1 username2
+
+
## 个性化
修改 `~/.vimrc.local` 文件内容,以启用个性化定制,可覆盖 `~/.vimrc` 中的设置。
@@ -193,10 +200,6 @@ An automatic configuration program for vim
vimplus安装完毕之后,`~`目录下将会生成两个隐藏文件分别是.vimrc和.ycm_extra_conf.py,其中.vimrc是vim的配置文件,.ycm_extra_conf.py是ycm插件的配置文件,当你需要创建一个project时,需要将.ycm_extra_conf.py拷贝到project的顶层目录,通过修改该配置文件里面的`flags`变量来添加你的第三方库路径。
-- **`在A用户下安装了vimplus,在B用户下不能使用?`**
-
- 目前vimplus是基于用户的,如果你想在其他用户下也能使用vimplus,也需要单独安装。
-
- **`怎么自定义文件头,比如说添加作者、创建时间?`**
你可以修改[chxuan/prepare-code][67]插件来达到目的,可以参考[这里][77]。
diff --git a/install_to_user.sh b/install_to_user.sh
new file mode 100755
index 00000000..50bf4e95
--- /dev/null
+++ b/install_to_user.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+
+# 获取平台类型,mac还是linux平台
+function get_platform_type()
+{
+ echo $(uname)
+}
+
+# 在linux上获取当前用户
+function get_current_username_on_linux()
+{
+ current_path=$PWD
+ array=(${current_path//// })
+
+ if [ ${array[0]} == "root" ]; then
+ echo ${array[0]}
+ else
+ echo ${array[1]}
+ fi
+}
+
+# 在linux上判断用户是否存在
+function is_valid_user_on_linux()
+{
+ desc_username=$1
+ usernames=$(ls /home/)
+ array=(${usernames// / })
+
+ is_found=0
+ for username in ${array[@]}
+ do
+ if [ $username == $desc_username ]; then
+ is_found=1
+ break
+ fi
+ done
+
+ if [ $desc_username == "root" ]; then
+ is_found=1
+ fi
+
+ echo $is_found
+}
+
+# 打印logo
+function print_logo()
+{
+ color="$(tput setaf 6)"
+ normal="$(tput sgr0)"
+ printf "${color}"
+ echo ' __ __ '
+ echo '__ __/_/___ ___ ____ / /_ _______ '
+ echo '\ \ / / / __ `__ \/ __ \/ / / / / ___/ '
+ echo ' \ V / / / / / / / /_/ / / /_/ (__ ) '
+ echo ' \_/_/_/ /_/ /_/ ,___/_/\____/____/ '
+ echo ' /_/ ...is now installed!'
+ echo ''
+ echo ''
+ echo 'Just enjoy it!'
+ echo 'p.s. Follow me at https://github.com/chxuan.'
+ echo ''
+ printf "${normal}"
+}
+
+# 获得home路径
+function get_home_path()
+{
+ username=$1
+ if [ $username == "root" ]; then
+ echo "/root/"
+ else
+ echo "/home/"$username"/"
+ fi
+}
+
+# 在linux上将vimplus安装到指定用户
+function install_to_user_on_linux()
+{
+ src_username=`get_current_username_on_linux`
+ desc_username=$1
+
+ # 判断是否是有效用户
+ is_found=$(is_valid_user_on_linux $desc_username)
+ if [ $is_found != 1 ]; then
+ echo "Invalid username "$desc_username
+ return
+ fi
+
+ # 判断是否是当前用户
+ if [ $src_username == $desc_username ]; then
+ echo "Can not install vimplus to "$desc_username
+ return
+ fi
+
+ src_home_path=$(get_home_path $src_username)
+ desc_home_path=$(get_home_path $desc_username)
+
+ echo "Current home path:"$src_home_path
+ echo "Installing vimplus to "$desc_home_path
+
+ # 拷贝.vim目录
+ src_vim_path=$src_home_path".vim/"
+ desc_vim_path=$desc_home_path".vim/"
+
+ rm -rf $desc_vim_path
+ mkdir $desc_vim_path
+
+ cp -R $src_vim_path"autoload/" $desc_vim_path
+ cp -R $src_vim_path"plugged/" $desc_vim_path
+
+ chown -R $desc_username":"$desc_username $desc_vim_path
+
+ # 拷贝.vimplus目录
+ src_vimplus_path=$src_home_path".vimplus/"
+ desc_vimplus_path=$desc_home_path".vimplus/"
+
+ rm -rf $desc_vimplus_path
+ cp -R $src_vimplus_path $desc_home_path
+ chown -R $desc_username":"$desc_username $desc_vimplus_path
+
+ rm -rf $desc_home_path".vimrc.local"
+ cp $desc_vimplus_path".vimrc.local" $desc_home_path
+ chown $desc_username":"$desc_username $desc_home_path".vimrc.local"
+
+ # 创建软链接
+ rm -rf $desc_home_path".vimrc"
+ ln -s $desc_vimplus_path".vimrc" $desc_home_path
+ chown -R $desc_username":"$desc_username $desc_home_path".vimrc"
+
+ rm -rf $desc_home_path".ycm_extra_conf.py"
+ ln -s $desc_vimplus_path".ycm_extra_conf.py" $desc_home_path
+ chown -R $desc_username":"$desc_username $desc_home_path".ycm_extra_conf.py"
+
+ ln -s $desc_vimplus_path"colors" $desc_vim_path
+ chown -R $desc_username":"$desc_username $desc_vim_path"colors"
+
+ ln -s $desc_vimplus_path"ftplugin" $desc_vim_path
+ chown -R $desc_username":"$desc_username $desc_vim_path"ftplugin"
+
+ # 安装字体
+ mkdir $desc_home_path".fonts/"
+ rm -rf $desc_home_path".fonts/Droid Sans Mono Nerd Font Complete.otf"
+ cp $desc_vimplus_path"fonts/Droid Sans Mono Nerd Font Complete.otf" $desc_home_path".fonts/"
+ chown -R $desc_username":"$desc_username $desc_home_path".fonts/"
+ fc-cache -vf $desc_home_path".fonts/"
+}
+
+# 脚本启动点
+if [ $# -lt 1 ]; then
+ echo "Please input username!"
+ exit 1
+fi
+
+type=`get_platform_type`
+echo "Platform type: "${type}
+
+if [ ${type} == "Linux" ]; then
+ for username in $@
+ do
+ install_to_user_on_linux $username
+ done
+
+ print_logo
+else
+ echo "Not support platform type: "${type}
+fi
+
From 36db484caa5c0543f4e4f410ad644dbf960dc144 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 25 Sep 2019 15:58:52 +0800
Subject: [PATCH 015/176] update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 967922f7..f556bcf0 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ An automatic configuration program for vim
将vimplus在某个用户下安装好后,若需要在其他用户也能够使用vimplus,则执行
- sudo ./install_to_user.sh username1 username2
+ sudo ./install_to_user.sh username1 username2 //替换为真实用户名
## 个性化
From 242a77f90dd615f4232a1e86480bf1df107cb5ef Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 25 Sep 2019 17:09:08 +0800
Subject: [PATCH 016/176] update uninstall.sh
---
uninstall.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/uninstall.sh b/uninstall.sh
index e0081bdb..b6f554c3 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-sudo rm -rf ~/.vim
+rm -rf ~/.vim
+rm -rf ~/.vimrc
+rm -rf ~/.ycm_extra_conf.py
echo "Done!"
From b55812ea15dc0479b962c30d1e532217c7b6b55d Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 25 Sep 2019 17:23:10 +0800
Subject: [PATCH 017/176] update readme
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index f556bcf0..51632807 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ An automatic configuration program for vim
+
+
From b6126d595a4f1ba73e8d213782999ca1b6d3e99b Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 25 Sep 2019 17:25:36 +0800
Subject: [PATCH 018/176] update readme
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 51632807..6dff22ba 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@ An automatic configuration program for vim
+
+
-
-
From 535a9e59ac05d651ade49f8891a6a0f8f1ee6360 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Thu, 26 Sep 2019 22:17:30 +0800
Subject: [PATCH 019/176] update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6dff22ba..228c66fd 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ An automatic configuration program for vim
网络良好情况下,vimplus只需30分钟左右即可将vim cpp环境配置好,vimplus真正的做到了一键配置,不让用户操心。vimplus会安装一些必备软件,比如说python、cmake、gcc、fontconfig等,vimplus也考虑到了有些系统的vim不支持python,它会自动去下载vim源码将python支持编译进去,vimplus也会安装nerd-font不让vim显示出现乱码,最最重要的是vimplus实现了ycm自动编译安装,给折腾了几天ycm都没有安装好的用户带来了新的希望,而且vimplus也支持macos和linux众多发行版,让linux发烧友频繁切换发行版而不用操心vim环境配置。最后说了这么多,不如看[vimplus安装脚本][78]来的直接:smile:。
-- **`插件安装界面显示YouCompleteMe安装失败`**
+- **`插件安装界面显示YouCompleteMe安装失败,Invalid URL: https://gitee.com/chxuan/YouCompleteMe.git,Expected: https://github.com/Valloric/YouCompleteMe.git,PlugClean: required`**
在执行install.sh安装脚本时,ycm比其他插件早安装,当用户看到插件安装界面显示ycm安装失败时,其实ycm已经提前安装好了,忽略掉该错误即可。
From eb164f0191c7019e702351885ccd927190e30999 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Fri, 27 Sep 2019 17:59:23 +0800
Subject: [PATCH 020/176] support docker
---
README.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 228c66fd..6d4526ca 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An automatic configuration program for vim
-
+
@@ -74,6 +74,13 @@ An automatic configuration program for vim
sudo ./install_to_user.sh username1 username2 //替换为真实用户名
+### Docker
+
+[ubuntu-vimplus][79]是vimplus基于ubuntu18.04的docker镜像,无需安装vimplus,即可快速体验vimplus带来的快乐
+
+ docker run -it chxuan/ubuntu-vimplus
+
+
## 个性化
修改 `~/.vimrc.local` 文件内容,以启用个性化定制,可覆盖 `~/.vimrc` 中的设置。
@@ -302,4 +309,5 @@ This software is licensed under the [MIT license][75]. © 2016 chxuan
[76]: https://blog.csdn.net/wang73ying/article/details/82491993
[77]: https://blog.csdn.net/liuyangbo121/article/details/82971736
[78]: https://github.com/chxuan/vimplus/blob/master/install.sh
+ [79]: https://cloud.docker.com/u/chxuan/repository/docker/chxuan/ubuntu-vimplus
From 53c898b5bfbdecb7ee439eaf402f741a8b277b4d Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Fri, 27 Sep 2019 19:08:19 +0800
Subject: [PATCH 021/176] update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6d4526ca..0b181f37 100644
--- a/README.md
+++ b/README.md
@@ -309,5 +309,5 @@ This software is licensed under the [MIT license][75]. © 2016 chxuan
[76]: https://blog.csdn.net/wang73ying/article/details/82491993
[77]: https://blog.csdn.net/liuyangbo121/article/details/82971736
[78]: https://github.com/chxuan/vimplus/blob/master/install.sh
- [79]: https://cloud.docker.com/u/chxuan/repository/docker/chxuan/ubuntu-vimplus
+ [79]: https://hub.docker.com/r/chxuan/ubuntu-vimplus
From 714be7ecd04709c4c5641805629d4132ea23b00b Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sat, 28 Sep 2019 21:26:14 +0800
Subject: [PATCH 022/176] update readme
---
README.md | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 0b181f37..788c7e18 100644
--- a/README.md
+++ b/README.md
@@ -172,10 +172,9 @@ An automatic configuration program for vim
| `daf` | 删除函数内容(包括函数名 花括号) |
| `caf` | 改写函数内容(包括函数名 花括号) |
| `fa` | 查找字母a,然后再按f键查找下一个 |
-| `` | Emoji:dog:补全 |
-## Q & A
+## FAQ
- **`vimplus安装脚本会在自己电脑上安装哪些软件?`**
@@ -226,14 +225,7 @@ An automatic configuration program for vim
那就麻烦您打赏一颗:star::star:吧,给予我继续维护的动力。
-## 支持开源:heart:
-
-| wechat | alipay |
-| ---------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
-|
|
|
-
-
-## 贡献者
+## 代码贡献者
@@ -251,6 +243,17 @@ An automatic configuration program for vim
+## 支持开源:heart:
+
+| wechat | alipay |
+| ---------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+|
|
|
+
+| 支持者 | RMB | 时间 |
+| ------- | ----- | ----- |
+| [zhoumengkang][80] | ¥50 | 2019-09-28 |
+
+
## vimplus:star:趋势图
[](https://stars.medv.io/chxuan/vimplus)
@@ -310,4 +313,5 @@ This software is licensed under the [MIT license][75]. © 2016 chxuan
[77]: https://blog.csdn.net/liuyangbo121/article/details/82971736
[78]: https://github.com/chxuan/vimplus/blob/master/install.sh
[79]: https://hub.docker.com/r/chxuan/ubuntu-vimplus
+ [80]: https://github.com/zhoumengkang
From c9ce29be87fd579d49e70ba4268b945e604d60d2 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sat, 28 Sep 2019 18:38:32 -0700
Subject: [PATCH 023/176] add vimrc backup
---
install.sh | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/install.sh b/install.sh
index 906dee5f..356c7089 100755
--- a/install.sh
+++ b/install.sh
@@ -36,6 +36,39 @@ function get_linux_distro()
fi
}
+# 获取日期
+function get_datetime()
+{
+ time=$(date "+%Y%m%d%H%M%S")
+ echo $time
+}
+
+# 判断文件是否存在
+function is_exist_file()
+{
+ filename=$1
+ if [ -f $filename ]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+
+#备份原有的.vimrc文件
+function backup_vimrc()
+{
+ old_vimrc=$HOME"/.vimrc"
+ is_exist=$(is_exist_file $old_vimrc)
+ if [ $is_exist == 1 ]; then
+ time=$(get_datetime)
+ backup_vimrc=$old_vimrc"_bak_"$time
+ read -p "Find "$old_vimrc" already exists,do you wang to backup "$old_vimrc" to "$backup_vimrc"[Y/N]:" ch
+ if [ $ch == "Y" ] || [ $ch == "y" ]; then
+ cp $old_vimrc $backup_vimrc
+ fi
+ fi
+}
+
# 判断是否是ubuntu14.04LTS版本
function is_ubuntu1404()
{
@@ -313,6 +346,7 @@ function print_logo()
# 在mac平台安装vimplus
function install_vimplus_on_mac()
{
+ backup_vimrc
install_prepare_software_on_mac
copy_files
install_fonts_on_mac
@@ -336,6 +370,7 @@ function begin_install_vimplus()
# 在ubuntu上安装vimplus
function install_vimplus_on_ubuntu()
{
+ backup_vimrc
install_prepare_software_on_ubuntu
begin_install_vimplus
}
@@ -343,6 +378,7 @@ function install_vimplus_on_ubuntu()
# 在debian上安装vimplus
function install_vimplus_on_debian()
{
+ backup_vimrc
install_prepare_software_on_debian
begin_install_vimplus
}
@@ -350,6 +386,7 @@ function install_vimplus_on_debian()
# 在centos上安装vimplus
function install_vimplus_on_centos()
{
+ backup_vimrc
install_prepare_software_on_centos
begin_install_vimplus
}
@@ -357,6 +394,7 @@ function install_vimplus_on_centos()
# 在fedora上安装vimplus
function install_vimplus_on_fedora()
{
+ backup_vimrc
install_prepare_software_on_fedora
begin_install_vimplus
}
@@ -364,6 +402,7 @@ function install_vimplus_on_fedora()
# 在archlinux上安装vimplus
function install_vimplus_on_archlinux()
{
+ backup_vimrc
install_prepare_software_on_archlinux
begin_install_vimplus
}
@@ -371,6 +410,7 @@ function install_vimplus_on_archlinux()
# 在opensuse上安装vimplus
function install_vimplus_on_opensuse()
{
+ backup_vimrc
install_prepare_software_on_opensuse
begin_install_vimplus
}
From a987ce214b250082338b5351deef04169bb6357f Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sun, 29 Sep 2019 10:03:41 +0800
Subject: [PATCH 024/176] add backup vimrc and vim
---
install.sh | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/install.sh b/install.sh
index 356c7089..17a26195 100755
--- a/install.sh
+++ b/install.sh
@@ -54,21 +54,54 @@ function is_exist_file()
fi
}
+# 判断目录是否存在
+function is_exist_dir()
+{
+ dir=$1
+ if [ -d $dir ]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+
#备份原有的.vimrc文件
-function backup_vimrc()
+function backup_vimrc_file()
{
old_vimrc=$HOME"/.vimrc"
is_exist=$(is_exist_file $old_vimrc)
if [ $is_exist == 1 ]; then
time=$(get_datetime)
backup_vimrc=$old_vimrc"_bak_"$time
- read -p "Find "$old_vimrc" already exists,do you wang to backup "$old_vimrc" to "$backup_vimrc"[Y/N]:" ch
+ read -p "Find "$old_vimrc" already exists,backup "$old_vimrc" to "$backup_vimrc"[Y/N]:" ch
if [ $ch == "Y" ] || [ $ch == "y" ]; then
cp $old_vimrc $backup_vimrc
fi
fi
}
+#备份原有的.vim目录
+function backup_vim_dir()
+{
+ old_vim=$HOME"/.vim"
+ is_exist=$(is_exist_dir $old_vim)
+ if [ $is_exist == 1 ]; then
+ time=$(get_datetime)
+ backup_vim=$old_vim"_bak_"$time
+ read -p "Find "$old_vim" already exists,backup "$old_vim" to "$backup_vim"[Y/N]:" ch
+ if [ $ch == "Y" ] || [ $ch == "y" ]; then
+ cp -R $old_vim $backup_vim
+ fi
+ fi
+}
+
+# 备份原有的.vimrc和.vim
+function backup_vimrc_and_vim()
+{
+ backup_vimrc_file
+ backup_vim_dir
+}
+
# 判断是否是ubuntu14.04LTS版本
function is_ubuntu1404()
{
@@ -346,7 +379,7 @@ function print_logo()
# 在mac平台安装vimplus
function install_vimplus_on_mac()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_mac
copy_files
install_fonts_on_mac
@@ -370,7 +403,7 @@ function begin_install_vimplus()
# 在ubuntu上安装vimplus
function install_vimplus_on_ubuntu()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_ubuntu
begin_install_vimplus
}
@@ -378,7 +411,7 @@ function install_vimplus_on_ubuntu()
# 在debian上安装vimplus
function install_vimplus_on_debian()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_debian
begin_install_vimplus
}
@@ -386,7 +419,7 @@ function install_vimplus_on_debian()
# 在centos上安装vimplus
function install_vimplus_on_centos()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_centos
begin_install_vimplus
}
@@ -394,7 +427,7 @@ function install_vimplus_on_centos()
# 在fedora上安装vimplus
function install_vimplus_on_fedora()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_fedora
begin_install_vimplus
}
@@ -402,7 +435,7 @@ function install_vimplus_on_fedora()
# 在archlinux上安装vimplus
function install_vimplus_on_archlinux()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_archlinux
begin_install_vimplus
}
@@ -410,7 +443,7 @@ function install_vimplus_on_archlinux()
# 在opensuse上安装vimplus
function install_vimplus_on_opensuse()
{
- backup_vimrc
+ backup_vimrc_and_vim
install_prepare_software_on_opensuse
begin_install_vimplus
}
From cabcbceb513341c829f7be5b6b9ac8fe043a22f2 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sat, 28 Sep 2019 20:23:40 -0700
Subject: [PATCH 025/176] add backup vim and vimrc
---
install_to_user.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/install_to_user.sh b/install_to_user.sh
index 50bf4e95..84c914f3 100755
--- a/install_to_user.sh
+++ b/install_to_user.sh
@@ -42,6 +42,78 @@ function is_valid_user_on_linux()
echo $is_found
}
+# 获取日期
+function get_datetime()
+{
+ time=$(date "+%Y%m%d%H%M%S")
+ echo $time
+}
+
+# 判断文件是否存在
+function is_exist_file()
+{
+ filename=$1
+ if [ -f $filename ]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+
+# 判断目录是否存在
+function is_exist_dir()
+{
+ dir=$1
+ if [ -d $dir ]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+
+#备份原有的.vimrc文件
+function backup_vimrc_file()
+{
+ user=$1
+ home_path=$2
+ old_vimrc=$home_path".vimrc"
+ is_exist=$(is_exist_file $old_vimrc)
+ if [ $is_exist == 1 ]; then
+ time=$(get_datetime)
+ backup_vimrc=$old_vimrc"_bak_"$time
+ read -p "Find "$old_vimrc" already exists,backup "$old_vimrc" to "$backup_vimrc"[Y/N]:" ch
+ if [ $ch == "Y" ] || [ $ch == "y" ]; then
+ cp $old_vimrc $backup_vimrc
+ chown $user":"$user $backup_vimrc
+ fi
+ fi
+}
+
+#备份原有的.vim目录
+function backup_vim_dir()
+{
+ user=$1
+ home_path=$2
+ old_vim=$home_path".vim"
+ is_exist=$(is_exist_dir $old_vim)
+ if [ $is_exist == 1 ]; then
+ time=$(get_datetime)
+ backup_vim=$old_vim"_bak_"$time
+ read -p "Find "$old_vim" already exists,backup "$old_vim" to "$backup_vim"[Y/N]:" ch
+ if [ $ch == "Y" ] || [ $ch == "y" ]; then
+ cp -R $old_vim $backup_vim
+ chown -R $user":"$user $backup_vim
+ fi
+ fi
+}
+
+# 备份原有的.vimrc和.vim
+function backup_vimrc_and_vim()
+{
+ backup_vimrc_file $1 $2
+ backup_vim_dir $1 $2
+}
+
# 打印logo
function print_logo()
{
@@ -98,6 +170,8 @@ function install_to_user_on_linux()
echo "Current home path:"$src_home_path
echo "Installing vimplus to "$desc_home_path
+ backup_vimrc_and_vim $desc_username $desc_home_path
+
# 拷贝.vim目录
src_vim_path=$src_home_path".vim/"
desc_vim_path=$desc_home_path".vim/"
From 848e01e4f9d47f061f29726089aaac3b7b3307c2 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sun, 29 Sep 2019 11:25:40 +0800
Subject: [PATCH 026/176] update readme
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 788c7e18..5e34389e 100644
--- a/README.md
+++ b/README.md
@@ -249,9 +249,9 @@ An automatic configuration program for vim
| ---------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
|
|
|
-| 支持者 | RMB | 时间 |
-| ------- | ----- | ----- |
-| [zhoumengkang][80] | ¥50 | 2019-09-28 |
+| 序号 | 支持者 | RMB | 时间 |
+| ----- | ------- | ----- | ----- |
+| 1 | [zhoumengkang][80] | ¥50 | 2019-09-28 |
## vimplus:star:趋势图
From e9d91719e9a13a8ddf9f2358245afb091260ffbc Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sun, 29 Sep 2019 15:02:22 +0800
Subject: [PATCH 027/176] update readme
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 5e34389e..dee09e6d 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@ An automatic configuration program for vim
| 序号 | 支持者 | RMB | 时间 |
| ----- | ------- | ----- | ----- |
| 1 | [zhoumengkang][80] | ¥50 | 2019-09-28 |
+| 2 | [zhoumengkang][80] | ¥50 | 2019-09-29 |
## vimplus:star:趋势图
From 25e707145c8f9ff22c4bdfc10e67088c596c12fe Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Sun, 29 Sep 2019 17:30:10 +0800
Subject: [PATCH 028/176] update install.sh
---
install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index 17a26195..33c26ce5 100755
--- a/install.sh
+++ b/install.sh
@@ -318,7 +318,7 @@ function install_vim_plugin()
# 在linux上安装ycm插件
function install_ycm_on_linux()
{
- git clone https://gitee.com/chxuan/YouCompleteMe_linux_with_clang.git ~/.vim/plugged/YouCompleteMe
+ git clone https://gitee.com/chxuan/YouCompleteMe-clang.git ~/.vim/plugged/YouCompleteMe
cd ~/.vim/plugged/YouCompleteMe
python2.7 ./install.py --clang-completer
@@ -344,7 +344,7 @@ function compile_ycm_on_mac_mojave()
# 在MacOS上安装ycm插件
function install_ycm_on_mac()
{
- git clone https://gitee.com/chxuan/YouCompleteMe.git ~/.vim/plugged/YouCompleteMe
+ git clone https://gitee.com/chxuan/YouCompleteMe-clang.git ~/.vim/plugged/YouCompleteMe
product_version=$(sw_vers | grep ProductVersion)
version=${product_version#*:}
From 80677ec4f636bb78910e135e9996cdce3d589d83 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Mon, 30 Sep 2019 09:45:17 +0800
Subject: [PATCH 029/176] Update install.sh
---
install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index 33c26ce5..234db4c4 100755
--- a/install.sh
+++ b/install.sh
@@ -328,7 +328,7 @@ function install_ycm_on_linux()
function compile_ycm_on_mac_legacy()
{
cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer --system-libclang
+ python2.7 ./install.py --clang-completer
}
# macos编译ycm, Mojave上的方法
@@ -338,7 +338,7 @@ function compile_ycm_on_mac_mojave()
xcode-select --install
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer --system-libclang
+ python2.7 ./install.py --clang-completer
}
# 在MacOS上安装ycm插件
From 1b57e599e41923ce41557bdad607e2f596a44952 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 8 Oct 2019 15:06:20 +0800
Subject: [PATCH 030/176] fix bug
---
.vimrc | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/.vimrc b/.vimrc
index c9af8b75..7a749773 100644
--- a/.vimrc
+++ b/.vimrc
@@ -248,17 +248,6 @@ let g:ycm_seed_identifiers_with_syntax = 1
let g:ycm_complete_in_comments = 1
let g:ycm_complete_in_strings = 1
let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
-nnoremap u :YcmCompleter GoToDeclaration
-" 已经使用cpp-mode插件提供的转到函数实现的功能
-" nnoremap i :YcmCompleter GoToDefinition
-nnoremap o :YcmCompleter GoToInclude
-nnoremap ff :YcmCompleter FixIt
-nmap :YcmDiags
-
-" ctags
-set tags+=/usr/include/tags
-set tags+=~/.vim/systags
-set tags+=~/.vim/x86_64-linux-gnu-systags
let g:ycm_collect_identifiers_from_tags_files = 1
let g:ycm_semantic_triggers = {
\ 'c' : ['->', '.','re![_a-zA-z0-9]'],
@@ -273,7 +262,17 @@ let g:ycm_semantic_triggers = {
\ 'lua' : ['.', ':'],
\ 'erlang' : [':'],
\ }
-let g:ycm_semantic_triggers.c = ['->', '.', ' ', '(', '[', '&',']']
+nnoremap u :YcmCompleter GoToDeclaration
+" 已经使用cpp-mode插件提供的转到函数实现的功能
+" nnoremap i :YcmCompleter GoToDefinition
+nnoremap o :YcmCompleter GoToInclude
+nnoremap ff :YcmCompleter FixIt
+nmap :YcmDiags
+
+" ctags
+set tags+=/usr/include/tags
+set tags+=~/.vim/systags
+set tags+=~/.vim/x86_64-linux-gnu-systags
" tagbar
let g:tagbar_width = 30
From d34e8acde8d178baa964ff1e12f3b285e8ddba48 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 8 Oct 2019 18:13:06 +0800
Subject: [PATCH 031/176] update vimrc
---
.vimrc | 3 ++
README.md | 98 +++++++++++++++++++++++++++-----------------------
help.md | 106 +++++++++++++++++++++++++++---------------------------
3 files changed, 110 insertions(+), 97 deletions(-)
diff --git a/.vimrc b/.vimrc
index 7a749773..88b95fcc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -176,6 +176,9 @@ nnoremap k
nnoremap h
nnoremap l
+"复制当前选中到系统剪切板
+vmap y "+y
+
" 打开文件自动定位到最后编辑的位置
autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g'\"" | endif
diff --git a/README.md b/README.md
index dee09e6d..ca21d79d 100644
--- a/README.md
+++ b/README.md
@@ -127,51 +127,59 @@ An automatic configuration program for vim
以下是部分快捷键,可通过vimplus的`,h`命令查看[vimplus帮助文档][59]。
-| 快捷键 | 说明 |
-| ------- | ----- |
-| `,` | Leader Key |
-| `n` | 打开/关闭代码资源管理器 |
-| `t` | 打开/关闭函数列表 |
-| `a` | .h .cpp 文件切换 |
-| `u` | 转到函数声明 |
-| `U` | 转到函数实现 |
-| `u` | 转到变量声明 |
-| `o` | 打开include文件 |
-| `y` | 拷贝函数声明 |
-| `p` | 生成函数实现 |
-| `w` | 单词跳转 |
-| `f` | 搜索~目录下的文件 |
-| `F` | 搜索当前目录下的文本 |
-| `g` | 显示git仓库提交记录 |
-| `G` | 显示当前文件提交记录 |
-| `gg` | 显示当前文件在某个commit下的完整内容 |
-| `ff` | 语法错误自动修复(FixIt) |
-| `` | 切换到上一个buffer |
-| `` | 切换到下一个buffer |
-| `d` | 删除当前buffer |
-| `D` | 删除当前buffer外的所有buffer |
-| `vim` | 运行vim编辑器时,默认启动开始页面 |
-| `` | 显示语法错误提示窗口 |
-| `` | 启用markdown实时预览 |
-| `` | 关闭markdown实时预览 |
-| `` | 显示上一主题 |
-| `` | 显示下一主题 |
-| `l` | 按竖线对齐 |
-| `=` | 按等号对齐 |
-| `Ya` | 复制行文本到字母a |
-| `Da` | 剪切行文本到字母a |
-| `Ca` | 改写行文本到字母a |
-| `rr` | 替换文本 |
-| `r` | 全局替换,目前只支持单个文件 |
-| `gcc` | 注释代码 |
-| `gcap` | 注释段落 |
-| `vif` | 选中函数内容 |
-| `dif` | 删除函数内容 |
-| `cif` | 改写函数内容 |
-| `vaf` | 选中函数内容(包括函数名 花括号) |
-| `daf` | 删除函数内容(包括函数名 花括号) |
-| `caf` | 改写函数内容(包括函数名 花括号) |
-| `fa` | 查找字母a,然后再按f键查找下一个 |
+| 快捷键 | 说明 |
+| ------- | ----- |
+| `,` | Leader Key |
+| `n` | 打开/关闭代码资源管理器 |
+| `t` | 打开/关闭函数列表 |
+| `a` | .h .cpp 文件切换 |
+| `u` | 转到函数声明 |
+| `U` | 转到函数实现 |
+| `u` | 转到变量声明 |
+| `o` | 打开include文件 |
+| `y` | 拷贝函数声明 |
+| `p` | 生成函数实现 |
+| `w` | 单词跳转 |
+| `f` | 搜索~目录下的文件 |
+| `F` | 搜索当前目录下的文本 |
+| `g` | 显示git仓库提交记录 |
+| `G` | 显示当前文件提交记录 |
+| `gg` | 显示当前文件在某个commit下的完整内容 |
+| `ff` | 语法错误自动修复(FixIt) |
+| `` | 切换到上一个buffer |
+| `` | 切换到下一个buffer |
+| `d` | 删除当前buffer |
+| `D` | 删除当前buffer外的所有buffer |
+| `vim` | 运行vim编辑器时,默认启动开始页面 |
+| `` | 显示语法错误提示窗口 |
+| `` | 启用markdown实时预览 |
+| `` | 关闭markdown实时预览 |
+| `` | 显示上一主题 |
+| `` | 显示下一主题 |
+| `l` | 按竖线对齐 |
+| `=` | 按等号对齐 |
+| `Ya` | 复制行文本到字母a |
+| `Da` | 剪切行文本到字母a |
+| `Ca` | 改写行文本到字母a |
+| `rr` | 替换文本 |
+| `r` | 全局替换,目前只支持单个文件 |
+| `gcc` | 注释代码 |
+| `gcap` | 注释段落 |
+| `vif` | 选中函数内容 |
+| `dif` | 删除函数内容 |
+| `cif` | 改写函数内容 |
+| `vaf` | 选中函数内容(包括函数名 花括号) |
+| `daf` | 删除函数内容(包括函数名 花括号) |
+| `caf` | 改写函数内容(包括函数名 花括号) |
+| `fa` | 查找字母a,然后再按f键查找下一个 |
+| `e` | 快速编辑vimrc文件 |
+| `s` | 重新加载vimrc文件 |
+| `h` | 打开vimplus帮助文档 |
+| `H` | 打开当前光标所在单词的vim帮助文档 |
+| `y` | 复制当前选中到系统剪切板 |
+| `i` | 安装插件 |
+| `u` | 更新插件 |
+| `c` | 删除插件 |
## FAQ
diff --git a/help.md b/help.md
index 981ba78d..8f52c964 100644
--- a/help.md
+++ b/help.md
@@ -1,50 +1,58 @@
## 插件相关
-| 快捷键 | 说明 |
-| ------- | ----- |
-| `,` | Leader Key |
-| `n` | 打开/关闭代码资源管理器 |
-| `t` | 打开/关闭函数列表 |
-| `a` | .h .cpp 文件切换 |
-| `u` | 转到函数声明 |
-| `U` | 转到函数实现 |
-| `u` | 转到变量声明 |
-| `o` | 打开include文件 |
-| `y` | 拷贝函数声明 |
-| `p` | 生成函数实现 |
-| `w` | 单词跳转 |
-| `f` | 搜索~目录下的文件 |
-| `F` | 搜索当前目录下的文本 |
-| `g` | 显示git仓库提交记录 |
-| `G` | 显示当前文件提交记录 |
-| `gg` | 显示当前文件在某个commit下的完整内容 |
-| `ff` | 语法错误自动修复(FixIt) |
-| `` | 切换到上一个buffer |
-| `` | 切换到下一个buffer |
-| `d` | 删除当前buffer |
-| `D` | 删除当前buffer外的所有buffer |
-| `vim` | 运行vim编辑器时,默认启动开始页面 |
-| `` | 显示语法错误提示窗口 |
-| `` | 启用markdown实时预览 |
-| `` | 关闭markdown实时预览 |
-| `` | 显示上一主题 |
-| `` | 显示下一主题 |
-| `l` | 按竖线对齐 |
-| `=` | 按等号对齐 |
-| `Ya` | 复制行文本到字母a |
-| `Da` | 剪切行文本到字母a |
-| `Ca` | 改写行文本到字母a |
-| `rr` | 替换文本 |
-| `r` | 全局替换,目前只支持单个文件 |
-| `gcc` | 注释代码 |
-| `gcap` | 注释段落 |
-| `vif` | 选中函数内容 |
-| `dif` | 删除函数内容 |
-| `cif` | 改写函数内容 |
-| `vaf` | 选中函数内容(包括函数名 花括号) |
-| `daf` | 删除函数内容(包括函数名 花括号) |
-| `caf` | 改写函数内容(包括函数名 花括号) |
-| `fa` | 查找字母a,然后再按f键查找下一个 |
+| 快捷键 | 说明 |
+| ------- | ----- |
+| `,` | Leader Key |
+| `n` | 打开/关闭代码资源管理器 |
+| `t` | 打开/关闭函数列表 |
+| `a` | .h .cpp 文件切换 |
+| `u` | 转到函数声明 |
+| `U` | 转到函数实现 |
+| `u` | 转到变量声明 |
+| `o` | 打开include文件 |
+| `y` | 拷贝函数声明 |
+| `p` | 生成函数实现 |
+| `w` | 单词跳转 |
+| `f` | 搜索~目录下的文件 |
+| `F` | 搜索当前目录下的文本 |
+| `g` | 显示git仓库提交记录 |
+| `G` | 显示当前文件提交记录 |
+| `gg` | 显示当前文件在某个commit下的完整内容 |
+| `ff` | 语法错误自动修复(FixIt) |
+| `` | 切换到上一个buffer |
+| `` | 切换到下一个buffer |
+| `d` | 删除当前buffer |
+| `D` | 删除当前buffer外的所有buffer |
+| `vim` | 运行vim编辑器时,默认启动开始页面 |
+| `` | 显示语法错误提示窗口 |
+| `` | 启用markdown实时预览 |
+| `` | 关闭markdown实时预览 |
+| `` | 显示上一主题 |
+| `` | 显示下一主题 |
+| `l` | 按竖线对齐 |
+| `=` | 按等号对齐 |
+| `Ya` | 复制行文本到字母a |
+| `Da` | 剪切行文本到字母a |
+| `Ca` | 改写行文本到字母a |
+| `rr` | 替换文本 |
+| `r` | 全局替换,目前只支持单个文件 |
+| `gcc` | 注释代码 |
+| `gcap` | 注释段落 |
+| `vif` | 选中函数内容 |
+| `dif` | 删除函数内容 |
+| `cif` | 改写函数内容 |
+| `vaf` | 选中函数内容(包括函数名 花括号) |
+| `daf` | 删除函数内容(包括函数名 花括号) |
+| `caf` | 改写函数内容(包括函数名 花括号) |
+| `fa` | 查找字母a,然后再按f键查找下一个 |
+| `e` | 快速编辑vimrc文件 |
+| `s` | 重新加载vimrc文件 |
+| `h` | 打开vimplus帮助文档 |
+| `H` | 打开当前光标所在单词的vim帮助文档 |
+| `y` | 复制当前选中到系统剪切板 |
+| `i` | 安装插件 |
+| `u` | 更新插件 |
+| `c` | 删除插件 |
## 插入模式
@@ -209,6 +217,7 @@
| `Y` | 复制当前行,同 yy |
| `yt,` | 复制到逗号 |
| `yiw` | 复制当前单词 |
+| `"+y` | 复制当前选中到系统剪切板 |
| `3yy` | 复制光标下三行内容 |
| `v0` | 选中当前位置到行首 |
| `v$` | 选中当前位置到行末 |
@@ -325,10 +334,3 @@
| ------- | ----- |
| `vim -u NONE -N` | 开启vim时不加载vimrc文件 |
| `vimdiff file1 file2` | 显示文件差异 |
-| `e` | 快速编辑vimrc文件 |
-| `s` | 重新加载vimrc文件 |
-| `h` | 打开vimplus帮助文档 |
-| `H` | 打开当前光标所在单词的vim帮助文档 |
-| `i` | 安装插件 |
-| `u` | 更新插件 |
-| `c` | 删除插件 |
From 13aa21971cba96f79172c40220fbad3d91b8893b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E6=A2=A6=E5=BA=B7?=
Date: Wed, 9 Oct 2019 11:44:17 +0800
Subject: [PATCH 032/176] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=84=8F?=
=?UTF-8?q?=E4=B9=89=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vimrc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.vimrc b/.vimrc
index 88b95fcc..09fc19a2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -272,11 +272,6 @@ nnoremap o :YcmCompleter GoToInclude
nnoremap ff :YcmCompleter FixIt
nmap :YcmDiags
-" ctags
-set tags+=/usr/include/tags
-set tags+=~/.vim/systags
-set tags+=~/.vim/x86_64-linux-gnu-systags
-
" tagbar
let g:tagbar_width = 30
nnoremap t :TagbarToggle
From b306f0d032223ab6c78996d2b5ddb05318823ec1 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 9 Oct 2019 11:54:07 +0800
Subject: [PATCH 033/176] update install.sh
---
install.sh | 45 ++++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/install.sh b/install.sh
index 234db4c4..0e24c533 100755
--- a/install.sh
+++ b/install.sh
@@ -113,6 +113,17 @@ function is_ubuntu1404()
fi
}
+# 判断是否是macos10.14版本
+function is_macos1014()
+{
+ product_version=$(sw_vers | grep ProductVersion)
+ if [[ $product_version =~ "10.14" ]]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+
# 在ubuntu上源代码安装vim
function compile_vim_on_ubuntu()
{
@@ -213,7 +224,14 @@ function compile_vim_on_centos()
# 安装mac平台必要软件
function install_prepare_software_on_mac()
{
+ xcode-select --install
+
brew install vim gcc cmake ctags-exuberant curl ack
+
+ macos1014=$(is_macos1014)
+ if [ $macos1014 == 1 ]; then
+ open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
+ fi
}
# 安装ubuntu必要软件
@@ -324,36 +342,13 @@ function install_ycm_on_linux()
python2.7 ./install.py --clang-completer
}
-# macos编译ycm, 原始方法
-function compile_ycm_on_mac_legacy()
-{
- cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer
-}
-
-# macos编译ycm, Mojave上的方法
-function compile_ycm_on_mac_mojave()
-{
- echo "Installing macOS_10.14 sdk headers..."
- xcode-select --install
- open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
- cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer
-}
-
# 在MacOS上安装ycm插件
function install_ycm_on_mac()
{
git clone https://gitee.com/chxuan/YouCompleteMe-clang.git ~/.vim/plugged/YouCompleteMe
- product_version=$(sw_vers | grep ProductVersion)
- version=${product_version#*:}
- main_version=${version%.*}
- if [ ${main_version} == "10.14" ]; then
- compile_ycm_on_mac_mojave
- else
- compile_ycm_on_mac_legacy
- fi
+ cd ~/.vim/plugged/YouCompleteMe
+ python2.7 ./install.py --clang-completer
}
# 打印logo
From 191e82837dd1491e7d3f4aa63fc2a07030b4bdc6 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 9 Oct 2019 11:55:59 +0800
Subject: [PATCH 034/176] update readme
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index ca21d79d..453e2b50 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,7 @@ An automatic configuration program for vim
 Shaloc |
 jokerkeny |
 xuthus5 |
+ zhoumengkang |
From f2c8ff029747449532f3ee0585780226e0179f1b Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 9 Oct 2019 11:57:50 +0800
Subject: [PATCH 035/176] update install.sh
---
install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install.sh b/install.sh
index 0e24c533..4508264a 100755
--- a/install.sh
+++ b/install.sh
@@ -491,7 +491,7 @@ function main()
type=`get_platform_type`
echo "Platform type: "${type}
- if [ ${type} == "Darwin" ]; then
+ if [ ${type} == "Darwin" ]; then
install_vimplus_on_mac
elif [ ${type} == "Linux" ]; then
install_vimplus_on_linux
From d45b7dc6ce0c6cca38e9e4e8bc79571d8a2a3e4d Mon Sep 17 00:00:00 2001
From: xuthus5
Date: Tue, 22 Oct 2019 13:14:38 +0800
Subject: [PATCH 036/176] Support CentOS8
---
install.sh | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index 4508264a..e1af1032 100755
--- a/install.sh
+++ b/install.sh
@@ -268,7 +268,10 @@ function install_prepare_software_on_centos()
# 安装fedora必要软件
function install_prepare_software_on_fedora()
{
- sudo dnf install -y vim ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
+ if [ ${distro} == "CentOS" ];then
+ sudo dnf install -y epel-release
+ fi
+ sudo dnf install -y vim ctags gcc gcc-c++ kernel-devel make automake cmake python3 python3-devel curl fontconfig ack git
}
# 安装archlinux必要软件
@@ -340,6 +343,11 @@ function install_ycm_on_linux()
cd ~/.vim/plugged/YouCompleteMe
python2.7 ./install.py --clang-completer
+ # 没有安装py2 使用py3
+ if [ "$?" -ne 0 ]; then
+ echo "未安装python2.x,使用python3.x安装ycm"
+ python3 ./install.py --clang-completer
+ fi
}
# 在MacOS上安装ycm插件
@@ -425,6 +433,8 @@ function install_vimplus_on_fedora()
backup_vimrc_and_vim
install_prepare_software_on_fedora
begin_install_vimplus
+ # 安装完毕后 将ycm的ycm_server_python_interpreter默认的py2解释器换成py3
+ sed -i 's/\/usr\/bin\/python2.7/\/usr\/bin\/python3/g' ~/.vimrc
}
# 在archlinux上安装vimplus
@@ -462,7 +472,13 @@ function install_vimplus_on_linux()
elif [ ${distro} == "Kali" ]; then
install_vimplus_on_debian
elif [ ${distro} == "CentOS" ]; then
- install_vimplus_on_centos
+ version=`sudo cat /etc/redhat-release | awk '{print $4}' | awk -F . '{printf "%s",$1}'`
+ if [ "$version" -gt 7 ];then
+ echo "CentOS Version > 7"
+ install_vimplus_on_fedora
+ else
+ install_vimplus_on_centos
+ fi
elif [ ${distro} == "fedora" ]; then
install_vimplus_on_fedora
elif [ ${distro} == "openSUSE" ]; then
From ae4cc75481072e25e6ad21d223745e2bcfdbf3ea Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 22 Oct 2019 16:46:57 +0800
Subject: [PATCH 037/176] add indentLine plugin
---
.vimrc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.vimrc b/.vimrc
index 09fc19a2..71e07351 100644
--- a/.vimrc
+++ b/.vimrc
@@ -117,6 +117,7 @@ Plug 'chxuan/vimplus-startify'
Plug 'chxuan/tagbar'
Plug 'Valloric/YouCompleteMe'
Plug 'Yggdroot/LeaderF'
+Plug 'Yggdroot/indentLine'
Plug 'mileszs/ack.vim'
Plug 'easymotion/vim-easymotion'
Plug 'haya14busa/incsearch.vim'
@@ -342,6 +343,9 @@ nnoremap g :GV
nnoremap G :GV!
nnoremap gg :GV?
+" indentLine 默认不启用
+let g:indentLine_enabled = 0
+
" 个性化
if filereadable(expand($HOME . '/.vimrc.local'))
source $HOME/.vimrc.local
From 37dabc5ec2318f0c5a07bb894352d3a0bc8e2cd6 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 22 Oct 2019 17:30:29 +0800
Subject: [PATCH 038/176] update vimrc.local
---
.vimrc.local | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.vimrc.local b/.vimrc.local
index f2fc826d..70b42e1f 100644
--- a/.vimrc.local
+++ b/.vimrc.local
@@ -1,2 +1,5 @@
-"set relativenumber " 开启相对行号
+" 开启相对行号
+" set relativenumber
+" 启动代码对齐线
+" let g:indentLine_enabled = 1
From 1f1f9c0de6c6dfec7d4056d89b12cfbb940db918 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 22 Oct 2019 18:03:42 +0800
Subject: [PATCH 039/176] set macvim gvim font
---
.vimrc | 54 +++++++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/.vimrc b/.vimrc
index 71e07351..416e8e15 100644
--- a/.vimrc
+++ b/.vimrc
@@ -92,8 +92,13 @@ set fileencodings=utf8,ucs-bom,gbk,cp936,gb2312,gb18030
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" gvim/macvim设置
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let uname = system('uname -s')
if has("gui_running")
- set guifont=Droid\ Sans\ Mono\ Nerd\ Font\ Complete:h18 " 设置字体
+ if uname == "Darwin\n"
+ set guifont=Droid\ Sans\ Mono\ Nerd\ Font\ Complete:h18 " 设置字体
+ else
+ set guifont=DroidSansMono\ Nerd\ Font\ Regular\ 18 " 设置字体
+ endif
set guioptions-=m " 隐藏菜单栏
set guioptions-=T " 隐藏工具栏
set guioptions-=L " 隐藏左侧滚动条
@@ -254,18 +259,18 @@ let g:ycm_complete_in_strings = 1
let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
let g:ycm_collect_identifiers_from_tags_files = 1
let g:ycm_semantic_triggers = {
- \ 'c' : ['->', '.','re![_a-zA-z0-9]'],
- \ 'objc' : ['->', '.', 're!\[[_a-zA-Z]+\w*\s', 're!^\s*[^\W\d]\w*\s',
- \ 're!\[.*\]\s'],
- \ 'ocaml' : ['.', '#'],
- \ 'cpp,objcpp' : ['->', '.', '::','re![_a-zA-Z0-9]'],
- \ 'perl' : ['->'],
- \ 'php' : ['->', '::'],
- \ 'cs,java,javascript,typescript,d,python,perl6,scala,vb,elixir,go' : ['.'],
- \ 'ruby' : ['.', '::'],
- \ 'lua' : ['.', ':'],
- \ 'erlang' : [':'],
- \ }
+ \ 'c' : ['->', '.','re![_a-zA-z0-9]'],
+ \ 'objc' : ['->', '.', 're!\[[_a-zA-Z]+\w*\s', 're!^\s*[^\W\d]\w*\s',
+ \ 're!\[.*\]\s'],
+ \ 'ocaml' : ['.', '#'],
+ \ 'cpp,objcpp' : ['->', '.', '::','re![_a-zA-Z0-9]'],
+ \ 'perl' : ['->'],
+ \ 'php' : ['->', '::'],
+ \ 'cs,java,javascript,typescript,d,python,perl6,scala,vb,elixir,go' : ['.'],
+ \ 'ruby' : ['.', '::'],
+ \ 'lua' : ['.', ':'],
+ \ 'erlang' : [':'],
+ \ }
nnoremap u :YcmCompleter GoToDeclaration
" 已经使用cpp-mode插件提供的转到函数实现的功能
" nnoremap i :YcmCompleter GoToDefinition
@@ -284,7 +289,6 @@ map ? (incsearch-backward)
map g/ (incsearch-stay)
" markdown
-let uname = system('uname -s')
if uname == "Darwin\n"
let g:mkdp_path_to_chrome = "/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome"
else
@@ -302,17 +306,17 @@ nmap w (easymotion-overwin-w)
" nerdtree-git-plugin
let g:NERDTreeIndicatorMapCustom = {
- \ "Modified" : "✹",
- \ "Staged" : "✚",
- \ "Untracked" : "✭",
- \ "Renamed" : "➜",
- \ "Unmerged" : "═",
- \ "Deleted" : "✖",
- \ "Dirty" : "✗",
- \ "Clean" : "✔︎",
- \ 'Ignored' : '☒',
- \ "Unknown" : "?"
- \ }
+ \ "Modified" : "✹",
+ \ "Staged" : "✚",
+ \ "Untracked" : "✭",
+ \ "Renamed" : "➜",
+ \ "Unmerged" : "═",
+ \ "Deleted" : "✖",
+ \ "Dirty" : "✗",
+ \ "Clean" : "✔︎",
+ \ 'Ignored' : '☒',
+ \ "Unknown" : "?"
+ \ }
" LeaderF
nnoremap f :LeaderfFile ~
From 9190517bbb82c580b327adac9ecda7ed6be3c03c Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Tue, 22 Oct 2019 23:23:33 +0800
Subject: [PATCH 040/176] update install.sh
---
install.sh | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/install.sh b/install.sh
index e1af1032..f3bdfd58 100755
--- a/install.sh
+++ b/install.sh
@@ -113,6 +113,13 @@ function is_ubuntu1404()
fi
}
+# 获取centos版本
+function get_centos_version()
+{
+ version=`cat /etc/redhat-release | awk '{print $4}' | awk -F . '{printf "%s",$1}'`
+ echo $version
+}
+
# 判断是否是macos10.14版本
function is_macos1014()
{
@@ -261,17 +268,20 @@ function install_prepare_software_on_debian()
# 安装centos必要软件
function install_prepare_software_on_centos()
{
- sudo yum install -y ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
- compile_vim_on_centos
+ version=$(get_centos_version)
+ if [ "$version" -gt 7 ];then
+ sudo yum install -y epel-release
+ sudo yum install -y ctags automake gcc gcc-c++ kernel-devel make cmake python2 python2-devel python3-devel curl fontconfig ack git
+ else
+ sudo yum install -y ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
+ compile_vim_on_centos
+ fi
}
# 安装fedora必要软件
function install_prepare_software_on_fedora()
{
- if [ ${distro} == "CentOS" ];then
- sudo dnf install -y epel-release
- fi
- sudo dnf install -y vim ctags gcc gcc-c++ kernel-devel make automake cmake python3 python3-devel curl fontconfig ack git
+ sudo dnf install -y vim ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
}
# 安装archlinux必要软件
@@ -343,11 +353,6 @@ function install_ycm_on_linux()
cd ~/.vim/plugged/YouCompleteMe
python2.7 ./install.py --clang-completer
- # 没有安装py2 使用py3
- if [ "$?" -ne 0 ]; then
- echo "未安装python2.x,使用python3.x安装ycm"
- python3 ./install.py --clang-completer
- fi
}
# 在MacOS上安装ycm插件
@@ -433,8 +438,6 @@ function install_vimplus_on_fedora()
backup_vimrc_and_vim
install_prepare_software_on_fedora
begin_install_vimplus
- # 安装完毕后 将ycm的ycm_server_python_interpreter默认的py2解释器换成py3
- sed -i 's/\/usr\/bin\/python2.7/\/usr\/bin\/python3/g' ~/.vimrc
}
# 在archlinux上安装vimplus
@@ -472,13 +475,7 @@ function install_vimplus_on_linux()
elif [ ${distro} == "Kali" ]; then
install_vimplus_on_debian
elif [ ${distro} == "CentOS" ]; then
- version=`sudo cat /etc/redhat-release | awk '{print $4}' | awk -F . '{printf "%s",$1}'`
- if [ "$version" -gt 7 ];then
- echo "CentOS Version > 7"
- install_vimplus_on_fedora
- else
- install_vimplus_on_centos
- fi
+ install_vimplus_on_centos
elif [ ${distro} == "fedora" ]; then
install_vimplus_on_fedora
elif [ ${distro} == "openSUSE" ]; then
From 5b49e9c1b6c5176d89e5c8cfa041d1ff4dd91edc Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 23 Oct 2019 08:53:59 +0800
Subject: [PATCH 041/176] update install.sh
---
install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index f3bdfd58..55d27640 100755
--- a/install.sh
+++ b/install.sh
@@ -270,8 +270,8 @@ function install_prepare_software_on_centos()
{
version=$(get_centos_version)
if [ "$version" -gt 7 ];then
- sudo yum install -y epel-release
- sudo yum install -y ctags automake gcc gcc-c++ kernel-devel make cmake python2 python2-devel python3-devel curl fontconfig ack git
+ sudo dnf install -y epel-release
+ sudo dnf install -y ctags automake gcc gcc-c++ kernel-devel make cmake python2 python2-devel python3-devel curl fontconfig ack git
else
sudo yum install -y ctags automake gcc gcc-c++ kernel-devel cmake python-devel python3-devel curl fontconfig ack git
compile_vim_on_centos
From 7afcfa8404b1a33d58b0e96c4bad83964e1d365e Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 23 Oct 2019 13:53:35 +0800
Subject: [PATCH 042/176] update vimrc
---
.vimrc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.vimrc b/.vimrc
index 416e8e15..a13d9f59 100644
--- a/.vimrc
+++ b/.vimrc
@@ -250,13 +250,14 @@ let g:NERDTreeDirArrowExpandable='▷'
let g:NERDTreeDirArrowCollapsible='▼'
" YCM
+" 如果不指定python解释器路径,ycm会自己搜索一个合适的(与编译ycm时使用的python版本匹配)
+" let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
let g:ycm_confirm_extra_conf = 0
let g:ycm_error_symbol = '✗'
let g:ycm_warning_symbol = '✹'
let g:ycm_seed_identifiers_with_syntax = 1
let g:ycm_complete_in_comments = 1
let g:ycm_complete_in_strings = 1
-let g:ycm_server_python_interpreter = '/usr/bin/python2.7'
let g:ycm_collect_identifiers_from_tags_files = 1
let g:ycm_semantic_triggers = {
\ 'c' : ['->', '.','re![_a-zA-z0-9]'],
From 8709a8198b1f20e77053fedf9c9ea11104230c2b Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 23 Oct 2019 14:22:00 +0800
Subject: [PATCH 043/176] =?UTF-8?q?=E7=BC=96=E8=AF=91ycm=E6=97=B6=E6=8F=90?=
=?UTF-8?q?=E4=BE=9Bpython2=E5=92=8Cpython3=E9=80=89=E9=A1=B9=E7=BB=99?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
install.sh | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/install.sh b/install.sh
index 55d27640..cd5a1cd7 100755
--- a/install.sh
+++ b/install.sh
@@ -346,22 +346,21 @@ function install_vim_plugin()
vim -c "PlugInstall" -c "q" -c "q"
}
-# 在linux上安装ycm插件
-function install_ycm_on_linux()
+# 安装ycm插件
+function install_ycm()
{
git clone https://gitee.com/chxuan/YouCompleteMe-clang.git ~/.vim/plugged/YouCompleteMe
cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer
-}
-
-# 在MacOS上安装ycm插件
-function install_ycm_on_mac()
-{
- git clone https://gitee.com/chxuan/YouCompleteMe-clang.git ~/.vim/plugged/YouCompleteMe
- cd ~/.vim/plugged/YouCompleteMe
- python2.7 ./install.py --clang-completer
+ read -p "Please choose to compile ycm with python2 or python3, if there is a problem with the current selection, please choose another one[2/3]:" version
+ if [ $version == "2" ]; then
+ echo "Compile ycm with python2."
+ python2.7 ./install.py --clang-completer
+ else
+ echo "Compile ycm with python3."
+ python3 ./install.py --clang-completer
+ fi
}
# 打印logo
@@ -391,7 +390,7 @@ function install_vimplus_on_mac()
install_prepare_software_on_mac
copy_files
install_fonts_on_mac
- install_ycm_on_mac
+ install_ycm
download_vim_plug
install_vim_plugin
print_logo
@@ -402,7 +401,7 @@ function begin_install_vimplus()
{
copy_files
install_fonts_on_linux
- install_ycm_on_linux
+ install_ycm
download_vim_plug
install_vim_plugin
print_logo
From 0cbab3fa40d026633978f75a6ad6e5763d98a048 Mon Sep 17 00:00:00 2001
From: chxuan <787280310@qq.com>
Date: Wed, 23 Oct 2019 15:52:41 +0800
Subject: [PATCH 044/176] update fonts
---
fonts/Droid Sans Mono Nerd Font Complete.otf | Bin 2209264 -> 2096400 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/fonts/Droid Sans Mono Nerd Font Complete.otf b/fonts/Droid Sans Mono Nerd Font Complete.otf
index d733c3d0031bd2842ef0c7e715471accf7a8f4e0..4836335d813d7ca654dcebc018068f4ce383a18f 100644
GIT binary patch
delta 101731
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