1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-04-15 08:09:11 +08:00

Merge branch 'native-func' into dev

This commit is contained in:
wsdjeg 2017-02-08 20:43:38 +08:00
commit f47bc17d97
18 changed files with 245 additions and 55 deletions

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
tags
doc/tags
*.html
*.class
.floo
.flooignore

View File

@ -410,6 +410,10 @@ Key | Mode | Action
----- |:----:| ------------------
`F2` | _All_ | Toggle tagbar
`F3` | _All_ | Toggle Vimfiler
`<leader>` + num | Normal | Jump to the buffer whit the num index
`<Alt>` + num | Normal | Jump to the buffer whit the num index, this only works in neovim
`<Alt>` + `h`/`<Left>` | Normal | Jump to left buffer in the tabline, this only works in neovim
`<Alt>` + `l`/`<Right>` | Normal | Jump to Right buffer in the tabline, this only works in neovim
`<leader>`+`ts` | Normal | Toggle spell-checker (:setlocal spell!)
`<leader>`+`tn` | Normal | Toggle line numbers (:setlocal nonumber!)
`<leader>`+`tl` | Normal | Toggle hidden characters (:setlocal nolist!)
@ -448,6 +452,18 @@ Key | Mode | Action
`<leader>`+`sv` | Normal | Split with previous buffer
`<leader>`+`sg` | Normal | Vertical split with previous buffer
SpaceVim has mapped normal <kbd>q</kbd> as smart buffer close, the normal func of <kbd>q</kbd>
can be get by <kbd>`<leader>` q r</kbd>
##### Native functions
Key | Mode | Action
----- |:----:| ------------------
`<leader>` + `qr` | Normal | Same as native `q`
`<leader>` + `qr/` | Normal | Same as native `q/`, open cmdwin
`<leader>` + `qr?` | Normal | Same as native `q?`, open cmdwin
`<leader>` + `qr:` | Normal | Same as native `q:`, open cmdwin
##### Plugin: Unite
Key | Mode | Action
@ -723,22 +739,5 @@ If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is usefu
[textobj-multiblock]: https://github.com/osyo-manga/vim-textobj-multiblock
<head>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-89745542-1', 'auto');
ga('send', 'pageview');
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<meta name="baidu-site-verification" content="rZl9hrrjp3" />
</head>

View File

@ -355,3 +355,15 @@ endfunction
" step 3: compile YouCompleteMe with the feature you want. if you just want
" support c family, you need run `./install.py --clang-completer`.
" <
"
" 2. How to add custom snippt?
"
" SpaceVim use neosnippet as default snippet engine. If you want to add
" snippet for vim filetype, open a vim file, run `:NeoSnippetEdit` command, a
" buffer will be opened, you can add your custom snippet, by default this
" buffer will be save in `~/.SpaceVim.d/snippets`, if you want to use other
" directory:
" >
" let g:neosnippet#snippets_directory = '~/path/to/snip_dir'
" <
" for more info about how to write snippet, please read ||neosnippet-snippet-syntax|.

View File

@ -263,9 +263,8 @@ function! SpaceVim#default#SetMappings() abort
" Select last paste
nnoremap <silent><expr> gp '`['.strpart(getregtype(), 0, 1).'`]'
" Disable Q and gQ
nnoremap Q <Nop>
nnoremap gQ <Nop>
" Use Q format lines
map Q gq
" Navigate window
nnoremap <silent><C-q> <C-w>

View File

@ -0,0 +1,13 @@
""
" @section Default, default
" @parentsection layers
function! SpaceVim#layers#default#plugins() abort
let plugins = []
return plugins
endfunction
function! SpaceVim#layers#default#config() abort
endfunction

View File

@ -1,6 +1,6 @@
function! SpaceVim#layers#lang#plugins() abort
let plugins = [
\ ['Shougo/neosnippet.vim', { 'on_i' : 1 , 'on_ft' : 'neosnippet', 'loadconf' : 1}],
\ ['Shougo/neosnippet.vim', { 'on_i' : 1 , 'on_ft' : 'neosnippet', 'loadconf' : 1, 'on_cmd' : 'NeoSnippetEdit'}],
\ ['m2mdas/phpcomplete-extended', { 'on_ft' : 'php'}],
\ ['groenewege/vim-less', { 'on_ft' : ['less']}],
\ ['cakebaker/scss-syntax.vim', { 'on_ft' : ['scss','sass']}],

View File

@ -1,6 +1,14 @@
let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/'), expand('~/.SpaceVim/snippets/')]
let g:neosnippet#snippets_directory = get(g:,'neosnippet#snippets_directory', '')
if empty(g:neosnippet#snippets_directory)
let g:neosnippet#snippets_directory = [expand('~/.SpaceVim/snippets/'), expand('~/.SpaceVim.d/snippets/')]
elseif type(g:spacevim_force_global_config) == type('')
let g:neosnippet#snippets_directory = [expand('~/.SpaceVim/snippets/'), expand('~/.SpaceVim.d/snippets/')] + [g:neosnippet#snippets_directory]
elseif type(g:spacevim_force_global_config) == type([])
let g:neosnippet#snippets_directory = [expand('~/.SpaceVim/snippets/'), expand('~/.SpaceVim.d/snippets/')] + g:neosnippet#snippets_directory
endif
if g:spacevim_force_global_config == 0
call add(g:neosnippet#snippets_directory, getcwd() . '/.Spacevim.d/snippets')
let g:neosnippet#snippets_directory = [getcwd() . '/.Spacevim.d/snippets'] + g:neosnippet#snippets_directory
endif
let g:neosnippet#enable_snipmate_compatibility=1
let g:neosnippet#enable_complete_done = 1

View File

@ -7,18 +7,19 @@ CONTENTS *SpaceVim-contents*
2. CONFIGURATION...........................................|SpaceVim-config|
3. Functions............................................|SpaceVim-functions|
4. Layers..................................................|SpaceVim-layers|
1. autocomplete..................................|SpaceVim-autocomplete|
2. checkers....................................|SpaceVim-layer-checkers|
3. colorscheme....................................|SpaceVim-colorscheme|
4. lang#c........................................|SpaceVim-layer-lang-c|
5. lang#elixir..............................|SpaceVim-layer-lang-elixir|
6. lang#go......................................|SpaceVim-layer-lang-go|
7. lang#java..................................|SpaceVim-layer-lang-java|
8. lang#php....................................|SpaceVim-layer-lang-php|
9. lang#python..............................|SpaceVim-layer-lang-python|
10. lang#rust.................................|SpaceVim-layer-lang-rust|
11. lang#xml...................................|SpaceVim-layer-lang-xml|
12. shell.........................................|SpaceVim-layer-shell|
1. Default............................................|SpaceVim-default|
2. autocomplete..................................|SpaceVim-autocomplete|
3. checkers....................................|SpaceVim-layer-checkers|
4. colorscheme....................................|SpaceVim-colorscheme|
5. lang#c........................................|SpaceVim-layer-lang-c|
6. lang#elixir..............................|SpaceVim-layer-lang-elixir|
7. lang#go......................................|SpaceVim-layer-lang-go|
8. lang#java..................................|SpaceVim-layer-lang-java|
9. lang#php....................................|SpaceVim-layer-lang-php|
10. lang#python.............................|SpaceVim-layer-lang-python|
11. lang#rust.................................|SpaceVim-layer-lang-rust|
12. lang#xml...................................|SpaceVim-layer-lang-xml|
13. shell.........................................|SpaceVim-layer-shell|
5. FAQ........................................................|SpaceVim-faq|
==============================================================================
@ -255,6 +256,9 @@ LAYERS *SpaceVim-layers*
SpaceVim support such layers:
==============================================================================
DEFAULT *SpaceVim-default*
==============================================================================
AUTOCOMPLETE *SpaceVim-autocomplete*
@ -600,5 +604,17 @@ it is hard to manager by vim plugin manager.)
support c family, you need run `./install.py --clang-completer`.
<
2. How to add custom snippt?
SpaceVim use neosnippet as default snippet engine. If you want to add snippet
for vim filetype, open a vim file, run `:NeoSnippetEdit` command, a buffer
will be opened, you can add your custom snippet, by default this buffer will
be save in `~/.SpaceVim.d/snippets`, if you want to use other directory:
>
let g:neosnippet#snippets_directory = '~/path/to/snip_dir'
<
for more info about how to write snippet, please read
||neosnippet-snippet-syntax|.
vim:tw=78:ts=8:ft=help:norl:

View File

@ -1,11 +1,8 @@
<p align="center"><img src="https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/docs/logo.png" alt="SpaceVim"/></p>
[![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)
[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](LICENSE)
[![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg?style=flat-square)](doc/SpaceVim.txt)
### Table of Contents
- [Introduction](#introduction)
- [Community](#community)
@ -724,14 +721,6 @@ If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is usefu
<head>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-89745542-1', 'auto');
ga('send', 'pageview');
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");

View File

@ -1 +1,6 @@
theme: jekyll-theme-midnight
theme: jekyll-theme-midnight
title: SpaceVim
description: spacevim - like spacemacs, but for vim
show_downloads: false
google_analytics: UA-89745542-1
project_repo_url: https://github.com/SpaceVim/SpaceVim

View File

@ -0,0 +1,82 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>{{ site.title | default: site.github.repository_name }} by {{ site.github.owner_name }}</title>
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="{{ '/assets/js/respond.js' | relative_url }}"></script>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!--[if lt IE 8]>
<link rel="stylesheet" href="{{ '/assets/css/ie.css' | relative_url }}">
<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
</head>
<body>
<div id="header">
<nav>
<li class="fork"><a href="{{ site.project_repo_url }}">View On GitHub</a></li>
{% if site.show_downloads %}
<li class="downloads"><a href="{{ site.github.zip_url }}">ZIP</a></li>
<li class="downloads"><a href="{{ site.github.tar_url }}">TAR</a></li>
<li class="title">DOWNLOADS</li>
{% endif %}
</nav>
</div><!-- end header -->
<div class="wrapper">
<section>
<div id="title">
<h1>{{ site.title | default: site.github.repository_name }}</h1>
<p>{{ site.description | default: site.github.project_tagline }}</p>
<hr>
<p align="center">
<b><a href="https://spacevim.org">Home</a></b> |
<b><a href="https://spacevim.org/about">about</a></b> |
<b><a href="https://spacevim.org/development">Development</a></b> |
<b><a href="https://spacevim.org/community">Community</a></b> |
<b><a href="https://spacevim.org/documentation">Documentation</a></b> |
<b><a href="https://spacevim.org/sponsors">Sponsors</a></b>
</p>
<hr>
</div>
{{ content }}
</section>
</div>
{% if site.google_analytics %}
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
pageTracker._trackPageview();
} catch(err) {}
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
{% endif %}
</body>
<root>
<p align="center">
<span class="credits right">Hosted on GitHub &mdash; Theme by <a href="https://twitter.com/michigangraham">mattgraham</a></span>
</p>
</root>
</html>

View File

@ -1,3 +1,19 @@
### About SpaceVim
## About SpaceVim
SpaceVim is ...
[SpaceVim](https://github.com/SpaceVim/SpaceVim) is a Modular configuration, a bundle of custom settings and plugins for Vim,
here we call them layers, each layer has different plugins and config, users just need
to select the layers they need. It got inspired by [spacemacs](https://github.com/syl20bnr/spacemacs). If you use SpaceVim,
please star it on github. It's a great way of getting feedback and gives me the kick to
put more time into development.
If you encounter any bugs or have feature requests, just open an issue
report on Github.
For learning about Vim in general, read [vim-galore](https://github.com/mhinz/vim-galore).
#### Credits & Thanks
- [![GitHub contributors](https://img.shields.io/github/contributors/SpaceVim/SpaceVim.svg)](https://github.com/SpaceVim/SpaceVim/graphs/contributors)
- [vimdoc](https://github.com/google/vimdoc) generate doc file for SpaceVim
- [Rafael Bodill](https://github.com/rafi) and his vim-config
- [Bailey Ling](https://github.com/bling) and his dotvim

View File

@ -0,0 +1 @@
Z8uu1sAUHC

17
docs/community.md Normal file
View File

@ -0,0 +1,17 @@
## Community
Try these SpaceVim hangouts for any questions, problems or comments.
### Ask
- [issue tracker](https://github.com/SpaceVim/SpaceVim/issues) for issue and feature requests
- vi StackExchange for "how to" & configuration questions
- [Twitter](https://twitter.com/SpaceVim) for hugs & pithy comments
### Chat
- [![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
- [![QQ](https://img.shields.io/badge/QQ群-121056965-blue.svg)](https://jq.qq.com/?_wv=1027&k=43DB6SG)
- [![Facebook](https://img.shields.io/badge/FaceBook-SpaceVim-blue.svg)](https://www.facebook.com/SpaceVim)
### Discuss
To report an issue or give feedback to the developers, please use the [issue tracker](https://github.com/SpaceVim/SpaceVim/issues).

11
docs/development.md Normal file
View File

@ -0,0 +1,11 @@
## Support SpaceVim
### Development happens in the GitHub repository.
[![Throughput Graph](https://graphs.waffle.io/SpaceVim/SpaceVim/throughput.svg)](https://github.com/SpaceVim/SpaceVim)
### Report bugs
If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is useful for me to debug for this issue.
### Contribute Layers

0
docs/documentation.md Normal file
View File

View File

@ -7,13 +7,33 @@
<!-- created with Free Online Sitemap Generator www.xml-sitemaps.com -->
<url>
<loc>http://spacevim.org/</loc>
<lastmod>2017-01-08T05:59:52+00:00</lastmod>
<loc>https://spacevim.org/</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>http://spacevim.org/doc/SpaceVim.txt</loc>
<lastmod>2017-01-08T05:59:47+00:00</lastmod>
<loc>https://spacevim.org/about</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>
<url>
<loc>https://spacevim.org/development</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://spacevim.org/community</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://spacevim.org/documentation</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://spacevim.org/sponsors</loc>
<lastmod>2017-02-06T18:09:15+00:00</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

3
docs/sponsors.md Normal file
View File

@ -0,0 +1,3 @@
## Current Sponsors