1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-04-14 23:49:19 +08:00

Merge branch 'dev' into lang/viml

This commit is contained in:
Wang Shidong 2017-01-31 20:20:39 +08:00 committed by GitHub
commit 99cea6bd6b
10 changed files with 53 additions and 17 deletions

View File

@ -44,6 +44,9 @@ function! SpaceVim#default#SetOptions() abort
set softtabstop=4
set shiftwidth=4
" autoread
set autoread
" backup
set backup
set undofile

View File

@ -1,6 +1,7 @@
""
" @section Autocomplete, autocomplete
" @section autocomplete, autocomplete
" @parentsection layers
" @subsection code completion
" SpaceVim use neocomplete as default completion engine for vim with lua
" support, if has no lua support neocomplcache will be the completion engine.
" SpaceVim use deoplete as default completion engine for nevoim. to make
@ -8,6 +9,11 @@
"
" SpaceVim include YouCompleteMe, but it is disabled by default, to enable
" ycm, see |g:spacevim_enable_ycm|.
"
" @subsection snippet
" SpaceVim use neosnippet as default snippet engine, and the default snippets
" is `Shougo/neosnippet-snippets`. for more information, please read
" |neosnippet|.

View File

@ -1,5 +1,5 @@
""
" @section Colorscheme, colorscheme
" @section colorscheme, colorscheme
" @parentsection layers
" SpaceVim default colorscheme is gruvbox, you can change it by set spacevim
" option. add this to your `~/.SpaceVim.d/init.vim`

View File

@ -10,7 +10,6 @@ function! SpaceVim#layers#lang#plugins() abort
\ ['wavded/vim-stylus', { 'on_ft' : ['styl']}],
\ ['digitaltoad/vim-jade', { 'on_ft' : ['jade']}],
\ ['juvenn/mustache.vim', { 'on_ft' : ['mustache']}],
\ ['Valloric/MatchTagAlways', { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}],
\ ['leafgarland/typescript-vim', { 'on_ft' : ['typescript']}],
\ ['kchmck/vim-coffee-script', { 'on_ft' : ['coffee']}],
\ ['leshill/vim-json', { 'on_ft' : ['javascript','json']}],

View File

@ -1,5 +1,5 @@
""
" @section Layer_lang_c
" @section lang#c, layer-lang-c
" @parentsection layers
" this layer provide c family language code completion and syntax chaeck.you
" need install clang.

View File

@ -1,5 +1,5 @@
""
" @section Layer_lang_java, layer_lang_java
" @section lang#java, layer-lang-java
" @parentsection layers
" This layer is for java development.
" >

View File

@ -1,5 +1,5 @@
""
" @section Layer_lang_php
" @section lang#php, layer-lang-php
" @parentsection layers
" this layer is for php development, and it provide auto codo completion,
" and syntax check, and jump to the definition location.

View File

@ -1,5 +1,5 @@
""
" @section layer-lang-rust, layer-lang-rust
" @section lang#rust, layer-lang-rust
" @parentsection layers
" SpaceVim do not load this layer by default, if you are a rust developer, you
" should add `call SpaceVim#layers#load('lang#rust')` to your @section(config)

View File

@ -0,0 +1,15 @@
""
" @section lang#xml, layer-lang-xml
" @parentsection layers
" when edite an xml file, the omni func is `xmlcomplete#CompleteTags`, you can
" read the document in `autoload/xmlcomplete.vim` in vim or neovim
" runtime directory.
function! SpaceVim#layers#lang#xml#plugins() abort
return [['Valloric/MatchTagAlways', { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}]]
endfunction
function! SpaceVim#layers#lang#xml#config() abort
endfunction

View File

@ -7,12 +7,13 @@ CONTENTS *SpaceVim-contents*
2. CONFIGURATION...........................................|SpaceVim-config|
3. Functions............................................|SpaceVim-functions|
4. Layers..................................................|SpaceVim-layers|
1. Autocomplete..................................|SpaceVim-autocomplete|
2. Colorscheme....................................|SpaceVim-colorscheme|
3. Layer_lang_c..................................|SpaceVim-layer_lang_c|
4. Layer_lang_java............................|SpaceVim-layer_lang_java|
5. Layer_lang_php..............................|SpaceVim-layer_lang_php|
6. layer-lang-rust............................|SpaceVim-layer-lang-rust|
1. autocomplete..................................|SpaceVim-autocomplete|
2. colorscheme....................................|SpaceVim-colorscheme|
3. lang#c........................................|SpaceVim-layer-lang-c|
4. lang#java..................................|SpaceVim-layer-lang-java|
5. lang#php....................................|SpaceVim-layer-lang-php|
6. lang#rust..................................|SpaceVim-layer-lang-rust|
7. lang#xml....................................|SpaceVim-layer-lang-xml|
5. FAQ........................................................|SpaceVim-faq|
==============================================================================
@ -244,6 +245,7 @@ LAYERS *SpaceVim-layers*
==============================================================================
AUTOCOMPLETE *SpaceVim-autocomplete*
CODE COMPLETION
SpaceVim use neocomplete as default completion engine for vim with lua
support, if has no lua support neocomplcache will be the completion engine.
SpaceVim use deoplete as default completion engine for nevoim. to make neovim
@ -252,6 +254,10 @@ support python, please read neovim's |provider-python|.
SpaceVim include YouCompleteMe, but it is disabled by default, to enable ycm,
see |g:spacevim_enable_ycm|.
SNIPPET
SpaceVim use neosnippet as default snippet engine, and the default snippets is
`Shougo/neosnippet-snippets`. for more information, please read |neosnippet|.
==============================================================================
COLORSCHEME *SpaceVim-colorscheme*
@ -384,7 +390,7 @@ colorschemes: if the colorscheme you want do not list below, PR welcome.
<
==============================================================================
LAYER_LANG_C *SpaceVim-layer_lang_c*
LANG#C *SpaceVim-layer-lang-c*
this layer provide c family language code completion and syntax chaeck.you
need install clang.
@ -421,7 +427,7 @@ setting it to 0 disables this feature.
==============================================================================
LAYER_LANG_JAVA *SpaceVim-layer_lang_java*
LANG#JAVA *SpaceVim-layer-lang-java*
This layer is for java development.
>
@ -458,7 +464,7 @@ This layer is for java development.
==============================================================================
LAYER_LANG_PHP *SpaceVim-layer_lang_php*
LANG#PHP *SpaceVim-layer-lang-php*
this layer is for php development, and it provide auto codo completion, and
syntax check, and jump to the definition location.
@ -472,7 +478,7 @@ requirement:
<
==============================================================================
LAYER-LANG-RUST *SpaceVim-layer-lang-rust*
LANG#RUST *SpaceVim-layer-lang-rust*
SpaceVim do not load this layer by default, if you are a rust developer, you
should add `call SpaceVim#layers#load('lang#rust')` to your |SpaceVim-config|
@ -498,6 +504,13 @@ mappings:
normal <leader>gd rust-doc
<
==============================================================================
LANG#XML *SpaceVim-layer-lang-xml*
when edite an xml file, the omni func is `xmlcomplete#CompleteTags`, you can
read the document in `autoload/xmlcomplete.vim` in vim or neovim runtime
directory.
==============================================================================
FAQ *SpaceVim-faq*