diff options
| author | juxiliary <juxiliary@gmail.com> | 2014-11-19 10:29:30 +1000 |
|---|---|---|
| committer | juxiliary <juxiliary@gmail.com> | 2014-11-19 18:06:53 +1000 |
| commit | 62a2a1d5cf4af0307f538a9bedb40e5756e89fb6 (patch) | |
| tree | 82c047765f7c432a863f2d5dadccef58bad9b632 | |
| parent | e09d98603e608c9e47d4c89f7b4dca87a4b56da3 (diff) | |
| download | rust-62a2a1d5cf4af0307f538a9bedb40e5756e89fb6.tar.gz rust-62a2a1d5cf4af0307f538a9bedb40e5756e89fb6.zip | |
Adding switch in vim plugin to toggle format opts
| -rw-r--r-- | src/etc/vim/doc/rust.txt | 9 | ||||
| -rw-r--r-- | src/etc/vim/ftplugin/rust.vim | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/etc/vim/doc/rust.txt b/src/etc/vim/doc/rust.txt index 80f8c3ca5e1..0295d68d97e 100644 --- a/src/etc/vim/doc/rust.txt +++ b/src/etc/vim/doc/rust.txt @@ -53,6 +53,15 @@ g:rust_conceal_pub~ let g:rust_conceal_pub = 1 < + *g:rust_recommended_style* +g:rust_recommended_style~ + Set this option to enable vim indentation and textwidth settings to + conform to style conventions of the rust standard library (i.e. use 4 + spaces for indents and sets 'textwidth' to 99). This option is enabled + by default. To disable it: > + let g:rust_recommended_style = 0 +< + *g:rust_fold* g:rust_fold~ Set this option to turn on |folding|: > diff --git a/src/etc/vim/ftplugin/rust.vim b/src/etc/vim/ftplugin/rust.vim index 09eaf62daf9..5d5569945f5 100644 --- a/src/etc/vim/ftplugin/rust.vim +++ b/src/etc/vim/ftplugin/rust.vim @@ -35,9 +35,10 @@ silent! setlocal formatoptions+=j " otherwise it's better than nothing. setlocal smartindent nocindent -setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab - -setlocal textwidth=99 +if !exists("g:rust_recommended_style") || g:rust_recommended_style == 1 + setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab + setlocal textwidth=99 +endif " This includeexpr isn't perfect, but it's a good start setlocal includeexpr=substitute(v:fname,'::','/','g') |