From 33089160ad11f6b764b206fcda8a0d862f5ae2cc Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Tue, 16 Feb 2016 13:33:42 -0500 Subject: [PATCH] Remove vim-autoformat --- .gitmodules | 3 --- README.md | 8 +------- vim/bundle/vim-autoformat | 1 - vim/config/keyboard.vim | 10 ++-------- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 160000 vim/bundle/vim-autoformat diff --git a/.gitmodules b/.gitmodules index 9e06715..41b4f2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,9 +61,6 @@ [submodule "vim/bundle/autoswap.vim"] path = vim/bundle/autoswap.vim url = https://github.com/vim-scripts/autoswap.vim.git -[submodule "vim/bundle/vim-autoformat"] - path = vim/bundle/vim-autoformat - url = https://github.com/Chiel92/vim-autoformat.git [submodule "vim/bundle/vim-polyglot-darkcloud"] path = vim/bundle/vim-polyglot-darkcloud url = https://github.com/prurigro/vim-polyglot-darkcloud.git diff --git a/README.md b/README.md index 1d3f12c..d79c075 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,9 @@ A theme, config and collection of plugins for Vim. ## Optional Requirements ## -* **Artistic Style**: Required by the _autoformat_ plugin to format C, C++, C++/CLI, C#, and Java source ([astyle website](http://astyle.sourceforge.net)). -* **autopep8**: Required by the _autoformat_ plugin to format Python using the PEP 8 style guide ([autopep8 repo](https://github.com/hhatto/autopep8)). * **Compilers and Runtimes**: The syntastic plugin can use the compiler or runtime for most languages to provide real-time syntax checking. * **CTags**: Required by the _tagbar_ and _neocomplcache_ plugins as well as the _gentags_ script ([ctags website](http://ctags.sourceforge.net)). -* **JS Beautifier**: Required by the _autoformat_ plugin to format Javascript source and HTML ([js-beautify repo](https://github.com/Chiel92/vim-autoformat)). * **Powerline Fonts**: Required to enable the fancier looking status line ([powerline-fonts repo](https://github.com/Lokaltog/powerline-fonts)). -* **Tidy**: Required by the _autoformat_ plugin to format XHTML and XML ([tidy website](http://tidy.sourceforge.net)). ## Distribution Features ## @@ -137,8 +133,7 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to |----------|------|---------------------------------------------------------------| | Leader+J | N+V | Format line/selected lines to a max width of the _textwidth_ | | Leader+f | N+V | Format document/selection alignment using Vim syntax | -| Leader+F | N | Format based on file-type using Autoformat | -| Leader+F | N+V | (Markdown) Format table cursor is currently on | +| Leader+f | N+V | (Markdown) Format table cursor is currently on | | Leader+t | N | Convert all tabs into spaces and continue session with spaces | | Leader+T | N | Convert all spaces into tabs and continue session with tabs | | Leader+w | N | Remove all trailing whitespace | @@ -159,7 +154,6 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l ## Plugins ## -* [auto-autoformat](https://github.com/Chiel92/vim-autoformat): Provides easy code formatting in Vim by integrating existing code formatters. * [autoswap.vim](https://github.com/vim-scripts/autoswap.vim): Switch to open editor window instead of asking what to do with swapfile. * [emmet-vim](https://github.com/mattn/emmet-vim): Support for expanding abbreviations. * [webapi-vim](https://github.com/mattn/webapi-vim): A web library used by emmet to provide support for custom snippets. diff --git a/vim/bundle/vim-autoformat b/vim/bundle/vim-autoformat deleted file mode 160000 index 5ed4c3c..0000000 --- a/vim/bundle/vim-autoformat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5ed4c3cfcbe1df13560db3b29da039a41631711b diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 1ade1d7..924f50a 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -201,7 +201,6 @@ " J | (V) -> split selection into lines of tw or 80 " f | (N) -> format document and return to cursor " f | (V) -> format the selection and return to cursor -" F | (N) -> format document using :Autoformat " t | (N) -> convert tabs into spaces " T | (N) -> convert spaces into tabs " w | (N) -> remove whitespace @@ -726,7 +725,6 @@ "format by Vim syntax + by Autoformat tool syntax nnoremap f mzgg=G`z:echo "The document has been formatted" vnoremap f mz=`z:echo "The selection has been formatted" - nnoremap F ':Autoformat:echo "The document has been formatted with :Autoformat"' "convert tabs to spaces and spaces to tabs nnoremap t ':let b:et=&expandtab:set expandtab:retab!:let &expandtab=b:et:echo "Tabs have been converted to spaces"' @@ -846,13 +844,9 @@ autocmd FileType help map ? ':q' endif - "html - "after running autoformat, remove linebreaks that aren't between tags - autocmd FileType html,xhtml nnoremap F ':Autoformat:%s/\n\s*\([^<\ ]\)/ \1/g:echo "The document has been formatted with :Autoformat"' - "markdown - autocmd FileType mkd nnoremap F ':TableFormat' - autocmd FileType mkd xnoremap F ':TableFormatgv' + autocmd FileType mkd nnoremap f ':TableFormat' + autocmd FileType mkd xnoremap f ':TableFormatgv' "qf-sidebar autocmd FileType qf map 0