Merge pull request #163 from di3goleite/master

Fix issues #100 and #147

vim_template/langs/c/c.vim

@@ -1,3 +1 @@
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1
+

vim_template/langs/elixir/elixir.vim

@@ -1,3 +0,0 @@
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1

vim_template/langs/go/go.bundle

@@ -1,3 +1,2 @@
 "" Go Lang Bundle
-NeoBundle "majutsushi/tagbar"
 NeoBundle "fatih/vim-go"

vim_template/langs/go/go.vim

@@ -1,7 +1,3 @@
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1
-
 let g:tagbar_type_go = {
     \ 'ctagstype' : 'go',
     \ 'kinds'     : [  'p:package', 'i:imports:1', 'c:constants', 'v:variables',

vim_template/langs/haskell/haskell.bundle

@@ -1,3 +1,4 @@
+"" Haskell Bundle
 NeoBundle "eagletmt/neco-ghc"
 NeoBundle "dag/vim2hs"
 NeoBundle "pbrisbin/vim-syntax-shakespeare"

vim_template/langs/javascript/javascript.bundle

@@ -1,2 +1,2 @@
 "" Javascript Bundle
-NeoBundle "scrooloose/syntastic"
+NeoBundle 'jelera/vim-javascript-syntax'

vim_template/langs/lua/lua.bundle

@@ -1,5 +1,3 @@
-NeoBundle "scrooloose/syntastic"
-NeoBundle "majutsushi/tagbar"
-
+"" Lua Bundle
 NeoBundle 'xolox/vim-lua-ftplugin'
 NeoBundle 'xolox/vim-lua-inspect'

vim_template/langs/lua/lua.vim

@@ -1,3 +0,0 @@
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1

vim_template/langs/ocaml/ocaml.bundle

@@ -1 +1,2 @@
+"" OCaml Bundle
 NeoBundle "def-lkb/ocp-indent-vim"

vim_template/langs/perl/perl.bundle

@@ -1,2 +1,3 @@
+"" Perl Bundle
 NeoBundle 'vim-perl/vim-perl'
 NeoBundle 'c9s/perlomni.vim'

vim_template/langs/python/python.bundle

@@ -1,5 +1,3 @@
 "" Python Bundle
 NeoBundle "davidhalter/jedi-vim"
-NeoBundle "scrooloose/syntastic"
-NeoBundle "majutsushi/tagbar"
 NeoBundle "Yggdroot/indentLine"

vim_template/langs/python/python.vim

@@ -22,8 +22,3 @@ let g:syntastic_python_flake8_post_args='--ignore=W391'
 
 " vim-airline
 let g:airline#extensions#virtualenv#enabled = 1
-let g:airline#extensions#tagbar#enabled = 1
-
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1

vim_template/langs/ruby/ruby.bundle

@@ -3,5 +3,4 @@ NeoBundle "tpope/vim-rails"
 NeoBundle "tpope/vim-rake"
 NeoBundle "tpope/vim-projectionist"
 NeoBundle "thoughtbot/vim-rspec"
-NeoBundle "majutsushi/tagbar"
 NeoBundle "ecomba/vim-ruby-refactoring"

vim_template/langs/ruby/ruby.vim

@@ -8,10 +8,6 @@ augroup vimrc-ruby
   autocmd FileType ruby set tabstop=2|set shiftwidth=2|set expandtab
 augroup END
 
-" Tagbar
-nmap <silent> <F4> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1
-
 let g:tagbar_type_ruby = {
     \ 'kinds' : [
         \ 'm:modules',

vim_template/vimrc

@@ -21,11 +21,11 @@ if !filereadable(neobundle_readme)
   let g:not_finsh_neobundle = "yes"
 
   " Run shell script if exist on custom select language
-  {% for b in bundle %}
-  {% if sh_exist(b) %}
+  {%- for b in bundle %}
+  {%- if sh_exist(b) %}
   silent !\curl -sSL https://raw.githubusercontent.com/avelino/vim-bootstrap/master/vim_template/langs/{{ b }}/{{ b }}.sh | bash -s stable
-  {% endif %}
-  {% endfor %}
+  {%- endif %}
+  {%- endfor %}
 endif
 
 " Required:
@@ -49,6 +49,8 @@ NeoBundle 'vim-scripts/grep.vim'
 NeoBundle 'vim-scripts/CSApprox'
 NeoBundle 'bronson/vim-trailing-whitespace'
 NeoBundle 'jiangmiao/auto-pairs'
+NeoBundle 'majutsushi/tagbar'
+NeoBundle 'scrooloose/syntastic'
 NeoBundle 'Shougo/vimproc.vim', {
       \ 'build' : {
       \     'windows' : 'tools\\update-dll-mingw',
@@ -81,9 +83,10 @@ NeoBundle 'tomasr/molokai'
 NeoBundle 'sherzberg/vim-bootstrap-updater'
 
 "" Custom bundles
-{% for b in bundle %}
+
+{% for b in bundle -%}
 {{ bundle[b] }}
-{% endfor %}
+{% endfor -%}
 
 "" Include user's extra bundle
 if filereadable(expand("{{editor.localbundlerc}}"))
@@ -212,6 +215,7 @@ let g:airline_theme = 'powerlineish'
 let g:airline#extensions#syntastic#enabled = 1
 let g:airline#extensions#branch#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tagbar#enabled = 1
 
 "*****************************************************************************
 "" Abbreviations
@@ -361,6 +365,9 @@ let g:syntastic_style_warning_symbol = '⚠'
 let g:syntastic_auto_loc_list=1
 let g:syntastic_aggregate_errors = 1
 
+" Tagbar
+nmap <silent> <F4> :TagbarToggle<CR>
+let g:tagbar_autofocus = 1
 
 " Disable visualbell
 set visualbell t_vb=
@@ -410,10 +417,11 @@ vnoremap K :m '<-2<CR>gv=gv
 noremap ,o :!echo `git url`/blob/`git rev-parse --abbrev-ref HEAD`/%\#L<C-R>=line('.')<CR> \| xargs open<CR><CR>
 
 "" Custom configs
-{% for v in vim %}
+{% for v in vim -%}
+{%- if vim[v] != '' %}
 {{ vim[v] }}
-{% endfor %}
-
+{%- endif %}
+{% endfor -%}
 "" Include user's local vim config
 if filereadable(expand("{{editor.localrc}}"))
   source {{editor.localrc}}