1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 22:40:04 +08:00

Merge branch 'dev' into lang/python

This commit is contained in:
wsdjeg 2017-02-02 01:03:28 +08:00
commit a070d9c6d6
9 changed files with 79 additions and 41 deletions

View File

@ -13,7 +13,7 @@
[![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim) [![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim)
[![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim) [![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim)
![2017-01-07_1363x723](https://cloud.githubusercontent.com/assets/13142418/21739011/6c38c14e-d4ca-11e6-8f3e-2c21dfc489c0.png) ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22506984/38c627ae-e8be-11e6-8f9c-37e260d069a7.png)
### Table of Contents ### Table of Contents
- [Introduction](#introduction) - [Introduction](#introduction)
@ -22,14 +22,21 @@
- [Windows support](#windows-support) - [Windows support](#windows-support)
- [File Structure](#file-structure) - [File Structure](#file-structure)
- Features - Features
- [Neovim centric - Dark powered mode](#neovim-centric---dark-powered-mode-of-spacevim)
- [Modular configuration](#modular-configuration)
- [multiple leader mode](#multiple-leader-mode)
- Lazy-load 90% of plugins with [dein.vim]
- Robust, yet light weight
- [Unite centric work-flow](#unite-centric-work-flow)
- [Awesome ui](#awesome-ui) - [Awesome ui](#awesome-ui)
- [Language specific mode](#language-specific-mode) - [Language specific mode](#language-specific-mode)
- [c/c++ support](#cc-support)
- python support
- [go support](#go-support)
- rust support
- php support
- perl support
- lua support
- [Unite centric work-flow](#unite-centric-work-flow)
- [Neovim centric - Dark powered mode](#neovim-centric---dark-powered-mode-of-spacevim)
- [multiple leader mode](#multiple-leader-mode)
- [Modular configuration](#modular-configuration)
- Lazy-load 90% of plugins with [dein.vim]
- Robust, yet light weight
- Extensive Neocomplete setup - Extensive Neocomplete setup
- Central location for tags - Central location for tags
- Lightweight simple status/tabline - Lightweight simple status/tabline
@ -114,6 +121,27 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
#### Features #### Features
##### Awesome ui
- outline + filemanager + checker
![2017-02-01_1360x721](https://cloud.githubusercontent.com/assets/13142418/22506638/84705532-e8bc-11e6-8b72-edbdaf08426b.png)
##### Language specific mode
###### c/c++ support
1. code completion: autocompletion and fuzzy match.
![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22505960/df9068de-e8b8-11e6-943e-d79ceca095f1.png)
2. syntax check: Asynchronous linting and make framework.
![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506340/e28b4782-e8ba-11e6-974b-ca29574dcc1f.png)
###### go support
1. code completion:
![2017-02-01_1360x721](https://cloud.githubusercontent.com/assets/13142418/22508345/8215c5e4-e8c4-11e6-95ec-f2a6e1e2f4d2.png)
2. syntax check:
![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22509944/108b6508-e8cb-11e6-8104-6310a29ae796.png)
##### Neovim centric - Dark powered mode of SpaceVim. ##### Neovim centric - Dark powered mode of SpaceVim.
By default, SpaceVim use these dark powered plugins: By default, SpaceVim use these dark powered plugins:
@ -183,32 +211,14 @@ For the list of mappings see the [link](#window-management)
Unite work flow leader can only be used in normal mode. Unite leader need unite groups. Unite work flow leader can only be used in normal mode. Unite leader need unite groups.
#### Unite centric work-flow #### Unite centric work-flow
- List all the plugins has been installed, fuzzy find what you want, - List all the plugins has been installed, fuzzy find what you want, default action is open the github website of current plugin. default key is `<leader>lp`
default action is open the github website of current plugin. default key is `<leader>lp`
[layer name] [plugin name] [load type] [plugin options]
![2017-01-21_1358x725](https://cloud.githubusercontent.com/assets/13142418/22175019/ce42d902-e027-11e6-89cd-4f44f70a10cd.png) ![2017-01-21_1358x725](https://cloud.githubusercontent.com/assets/13142418/22175019/ce42d902-e027-11e6-89cd-4f44f70a10cd.png)
- List all the mappings and description: `f<space>` - List all the mappings and description: `f<space>`
![2016-12-29-22 35 29](https://cloud.githubusercontent.com/assets/13142418/21546066/4896c5e2-ce17-11e6-8246-945b924df9aa.png) ![2017-02-01_1359x723](https://cloud.githubusercontent.com/assets/13142418/22507351/24af0d74-e8c0-11e6-985e-4a1404b629ed.png)
- List all the starred repos in github.com, fuzzy find and open the website of the repo. default key is `<leader>ls` - List all the starred repos in github.com, fuzzy find and open the website of the repo. default key is `<leader>ls`
![2016-12-29-22 38 52](https://cloud.githubusercontent.com/assets/13142418/21546148/c6836618-ce17-11e6-82a9-81e90017dbf1.png) ![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506915/deb99caa-e8bd-11e6-9b80-316281ddb48c.png)
#### Awesome ui
- outline + filemanager + checker
![2017-01-03-21 26 03](https://cloud.githubusercontent.com/assets/13142418/21609104/74567ce4-d1fb-11e6-9495-16aa5ad2e42d.png)
#### Language specific mode
- java
- viml
- rust
- php
- c/c++
- js
- python
#### Plugin Highlights #### Plugin Highlights

View File

@ -313,9 +313,11 @@ endfunction
function! SpaceVim#welcome() abort function! SpaceVim#welcome() abort
VimFiler if exists(':VimFiler') == 2 && exists(':Startify') == 2
wincmd p VimFiler
Startify wincmd p
Startify
endif
endfunction endfunction
"" ""

View File

@ -27,6 +27,9 @@ function! SpaceVim#default#SetOptions() abort
set relativenumber set relativenumber
set number set number
" hide cmd
set noshowcmd
" indent " indent
set autoindent set autoindent
set smartindent set smartindent
@ -78,7 +81,6 @@ function! SpaceVim#default#SetOptions() abort
set nowritebackup set nowritebackup
set matchtime=0 set matchtime=0
set ruler set ruler
set showcmd
set showmatch set showmatch
set showmode set showmode
"menuone: show the pupmenu when only one match "menuone: show the pupmenu when only one match

View File

@ -7,7 +7,10 @@
function! SpaceVim#layers#lang#xml#plugins() abort function! SpaceVim#layers#lang#xml#plugins() abort
return [['Valloric/MatchTagAlways', { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}]] let plugins = []
call add(plugins,['Valloric/MatchTagAlways', { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}])
call add(plugins,['sukima/xmledit', { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}])
return plugins
endfunction endfunction
function! SpaceVim#layers#lang#xml#config() abort function! SpaceVim#layers#lang#xml#config() abort

View File

@ -4,6 +4,7 @@ function! SpaceVim#layers#tools#plugins() abort
\ ['wsdjeg/vim-cheat', { 'on_cmd' : 'Cheat'}], \ ['wsdjeg/vim-cheat', { 'on_cmd' : 'Cheat'}],
\ ['wsdjeg/SourceCounter.vim', { 'on_cmd' : 'SourceCounter'}], \ ['wsdjeg/SourceCounter.vim', { 'on_cmd' : 'SourceCounter'}],
\ ['junegunn/goyo.vim', { 'on_cmd' : 'Goyo', 'loadconf' : 1}], \ ['junegunn/goyo.vim', { 'on_cmd' : 'Goyo', 'loadconf' : 1}],
\ ['junegunn/limelight.vim', { 'on_cmd' : 'Limelight'}],
\ ['Yggdroot/LeaderF', {'merged' : 0}], \ ['Yggdroot/LeaderF', {'merged' : 0}],
\ ['google/vim-searchindex'], \ ['google/vim-searchindex'],
\ ['simnalamburt/vim-mundo', { 'on_cmd' : 'MundoToggle'}], \ ['simnalamburt/vim-mundo', { 'on_cmd' : 'MundoToggle'}],

View File

@ -4,6 +4,7 @@ function! SpaceVim#layers#ui#plugins() abort
\ ['Yggdroot/indentLine'], \ ['Yggdroot/indentLine'],
\ ['mhinz/vim-signify'], \ ['mhinz/vim-signify'],
\ ['majutsushi/tagbar', {'loadconf' : 1}], \ ['majutsushi/tagbar', {'loadconf' : 1}],
\ ['lvht/tagbar-markdown',{'merged' : 0}],
\ ['vim-airline/vim-airline', { 'merged' : 0, 'loadconf' : 1}], \ ['vim-airline/vim-airline', { 'merged' : 0, 'loadconf' : 1}],
\ ['vim-airline/vim-airline-themes', { 'merged' : 0}], \ ['vim-airline/vim-airline-themes', { 'merged' : 0}],
\ ['mhinz/vim-startify', {'loadconf' : 1}], \ ['mhinz/vim-startify', {'loadconf' : 1}],

View File

@ -28,6 +28,7 @@ let g:deoplete#ignore_sources.c = ['omni']
let g:deoplete#ignore_sources.rust = ['omni'] let g:deoplete#ignore_sources.rust = ['omni']
let g:deoplete#ignore_sources.perl = ['omni'] let g:deoplete#ignore_sources.perl = ['omni']
call deoplete#custom#set('go', 'mark', '') call deoplete#custom#set('go', 'mark', '')
call deoplete#custom#set('go', 'rank', 9999)
call deoplete#custom#set('clang2', 'mark', '') call deoplete#custom#set('clang2', 'mark', '')
call deoplete#custom#set('racer', 'mark', '') call deoplete#custom#set('racer', 'mark', '')
if g:spacevim_enable_javacomplete2_py if g:spacevim_enable_javacomplete2_py

View File

@ -1,18 +1,26 @@
let s:save_option = {}
function! s:goyo_enter() function! s:goyo_enter()
silent !tmux set status off let s:save_option['showmode'] = &showmode
let s:save_option['showcmd'] = &showcmd
let s:save_option['scrolloff'] = &scrolloff
set noshowmode set noshowmode
set noshowcmd set noshowcmd
set scrolloff=999 set scrolloff=999
Limelight if exists(':Limelight') == 2
Limelight
let s:save_option['limelight'] = 1
endif
endfunction endfunction
function! s:goyo_leave() function! s:goyo_leave()
silent !tmux set status on let &showmode = s:save_option['showmode']
set showmode let &showcmd = s:save_option['showcmd']
set showcmd let &scrolloff = s:save_option['scrolloff']
set scrolloff=5 if get(s:save_option,'limelight', 0)
execute 'Limelight!'
endif
endfunction endfunction
augroup goyo_map augroup goyo_map
autocmd! User GoyoEnter nested call <SID>goyo_enter() autocmd! User GoyoEnter nested call <SID>goyo_enter()
autocmd! User GoyoLeave nested call <SID>goyo_leave() autocmd! User GoyoLeave nested call <SID>goyo_leave()
augroup END augroup END

View File

@ -1,2 +1,12 @@
let g:tagbar_width=30 let g:tagbar_width=30
let g:tagbar_left = 1 let g:tagbar_left = 1
let g:tagbar_type_markdown = {
\ 'ctagstype' : 'markdown',
\ 'kinds' : [
\ 'h:headings',
\ ],
\ 'sort' : 0
\ }