Clean up spacevim.vim and update travis/vintrc for neovim

Author: Tehnix

.travis.yml

@@ -5,4 +5,4 @@ before_install:
 - pip install --user vim-vint
 script:
 - mdl -c ./.mdlrc *.md
-- vint vimrc.sample autoload/*.vim plugin/*.vim
+- vint vimrc.sample autoload/*.vim

.vintrc.yaml

@@ -1,6 +1,13 @@
 cmdargs:
-# Checking more strictly
-severity: style_problem
+  # Checking more strictly
+  severity: style_problem
+  # Enable coloring
+  color: true
+  # Enable Neovim syntax
+  env:
+    neovim: true
 
-# Enable coloring
-color: true
+policies:
+  # Disable a violation
+  ProhibitNoAbortFunction:
+    enabled: false

autoload/spacevim.vim

@@ -8,13 +8,13 @@ let s:spacevim_layers_dir = expand(resolve(s:config_dir . '/spaceneovim-layers')
 function! spacevim#bootstrap() abort
   " Download the layers {{{
   if empty(glob(s:spacevim_layers_dir))
-    let install_layers = jobstart([
+    let l:install_layers = jobstart([
     \  'git'
     \, 'clone'
     \, '[email protected]:Tehnix/spaceneovim-layers.git'
     \, s:spacevim_layers_dir
     \])
-    let waiting_for_layers = jobwait([install_layers])
+    let l:waiting_for_layers = jobwait([l:install_layers])
   endif
   " }}}
 
@@ -30,10 +30,10 @@ function! spacevim#bootstrap() abort
   let g:spacevim_enabled_layers = []
 
   if exists('g:dotspacevim_configuration_layers')
-    for configuration_layer in g:dotspacevim_configuration_layers
-      for layer in g:spacevim_layers
-        if layer =~ configuration_layer
-          call add(g:spacevim_enabled_layers, layer)
+    for l:configuration_layer in g:dotspacevim_configuration_layers
+      for l:layer in g:spacevim_layers
+        if l:layer =~ l:configuration_layer
+          call add(g:spacevim_enabled_layers, l:layer)
         endif
       endfor
     endfor
@@ -42,16 +42,16 @@ function! spacevim#bootstrap() abort
 
   " Setup and install vim-plug {{{
   if empty(glob(s:vim_plug))
-    let install_plug = jobstart([
+    let l:install_plug = jobstart([
     \  'curl'
     \, '-fLo'
     \, s:vim_plug
     \, '--create-dirs'
     \, 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
     \])
-    let waiting_for_plug = jobwait([install_plug])
-    let install_plug_packages = jobstart(['nvim', '+PlugInstall', '+qall'])
-    let waiting_for_packages = jobwait([install_plug_packages])
+    let l:waiting_for_plug = jobwait([l:install_plug])
+    let l:install_plug_packages = jobstart(['nvim', '+PlugInstall', '+qall'])
+    let l:waiting_for_packages = jobwait([l:install_plug_packages])
     source $MYVIMRC
   endif
   " }}}
@@ -60,84 +60,20 @@ function! spacevim#bootstrap() abort
   call plug#begin(s:vim_plugged)
   Plug 'hecal3/vim-leader-guide'
   let g:spacevim_plugins = []
-  for layer in g:spacevim_enabled_layers
-    execute 'source ' . s:spacevim_layers_dir . '/layers/' . layer . '/packages.vim'
-    execute 'source ' . s:spacevim_layers_dir . '/layers/' . layer . '/config.vim'
+  for l:layer in g:spacevim_enabled_layers
+    execute 'source ' . s:spacevim_layers_dir . '/layers/' . l:layer . '/packages.vim'
+    execute 'source ' . s:spacevim_layers_dir . '/layers/' . l:layer . '/config.vim'
   endfor
 
-  for plugin in g:spacevim_plugins
-    Plug plugin.name, plugin.config
+  for l:plugin in g:spacevim_plugins
+    Plug l:plugin.name, l:plugin.config
   endfor
 
   if exists('g:dotspacevim_additional_plugins')
-    for additional_plugin in g:dotspacevim_additional_plugins
-      Plug additional_plugin
+    for l:additional_plugin in g:dotspacevim_additional_plugins
+      Plug l:additional_plugin.name, l:additional_plugin.config
     endfor
   endif
   call plug#end()
   " }}}
-
-endfunction
-
-" Helper functions {{{
-function! spacevim#add_plugin(name, config)
-  " Add a plugin to the list of plugins
-  if exists('g:spacevim_plugins')
-    call add(g:spacevim_plugins, {'name': a:name, 'config': a:config})
-    return 1
-  endif
-  return 0
-endfunction
-
-function! spacevim#is_layer_enabled(name)
-  " Check if a layer is enabled
-  if !exists('g:spacevim_enabled_layers')
-    return 1
-  endif
-  return index(g:spacevim_enabled_layers, a:name) != -1
-endfunction
-
-function! spacevim#bind(map, binding, name, value, isCmd)
-  if a:isCmd
-    let l:value = ':' . a:value . '<cr>'
-  else
-    let l:value = a:value
-  endif
-  if a:map ==# 'map' && maparg('<Leader>' . a:binding, '') ==# ''
-    let l:noremap = 'noremap'
-  elseif a:map ==# 'nmap' && maparg('<Leader>' . a:binding, 'n') ==# ''
-    let l:noremap = 'nnoremap'
-  elseif a:map ==# 'vmap' && maparg('<Leader>' . a:binding, 'v') ==# ''
-    let l:noremap = 'vnoremap'
-  elseif a:map ==# 'tmap' && maparg('<Leader>' . a:binding, 't') ==# ''
-    let l:noremap = 'tnoremap'
-  else
-    let l:noremap = ''
-  endif
-
-  if l:noremap !=# ''
-    execute l:noremap . ' <silent> <SID>' . a:name . '# ' . l:value
-    execute a:map . ' <Leader>' . a:binding . ' <SID>' . a:name . '#'
-  endif
-endfunction
-
-function! spacevim#bind_plug(map, binding, name, value)
-  if a:map ==# 'map' && maparg('<Leader>' . a:binding, '') ==# ''
-    let l:map = 'map'
-  elseif a:map ==# 'nmap' && maparg('<Leader>' . a:binding, 'n') ==# ''
-    let l:map = 'nmap'
-  elseif a:map ==# 'vmap' && maparg('<Leader>' . a:binding, 'v') ==# ''
-    let l:map = 'vmap'
-  elseif a:map ==# 'tmap' && maparg('<Leader>' . a:binding, 't') ==# ''
-    let l:map = 'tmap'
-  else
-    let l:map = ''
-  endif
-
-  if l:map !=# ''
-    execute l:map . ' <silent> <SID>' . a:name . '# <Plug>' . a:value
-    execute a:map . ' <Leader>' . a:binding . ' <SID>' . a:name . '#'
-  endif
 endfunction
-
-" }}}

vimrc.sample

@@ -3,18 +3,15 @@
 
 " dotspacevim/auto-install {{{
 " Automatic installation of spacevim.
-let config_dir = $HOME . '/.config/nvim'
-let autoload_spacevim = expand(resolve(config_dir . '/autoload/spacevim.vim'))
+let s:config_dir = $HOME . '/.config/nvim'
+let s:autoload_spacevim = expand(resolve(s:config_dir . '/autoload/spacevim.vim'))
 
-if empty(glob(autoload_spacevim))
-  let install_spacevim = jobstart([
-  \  'curl',
-  \  '-fLo',
-  \  autoload_spacevim,
-  \  '--create-dirs',
+if empty(glob(s:autoload_spacevim))
+  let l:install_spacevim = jobstart([
+  \  'curl', '-fLo', s:autoload_spacevim, '--create-dirs',
   \  'https://raw.githubusercontent.com/tehnix/spaceneovim/master/autoload/spacevim.vim'
   \])
-  let waiting_for_plug = jobwait([install_spacevim])
+  let l:waiting_for_plug = jobwait([l:install_spacevim])
 endif
 " }}}
 
@@ -26,18 +23,18 @@ endif
 " IMPORTANT: For the moment, any changes in plugins or layers needs
 " a vim restart and :PlugInstall
   let g:dotspacevim_configuration_layers = [
-  \  '+nav/files'
+  \  '+nav/buffers'
+  \, '+nav/files'
   \, '+nav/quit'
-  \, '+nav/buffers'
   \, '+nav/windows'
-  \, '+nav/text'
   \, '+nav/start-screen'
-  \, '+tools/terminal'
+  \, '+nav/text'
   \, '+checkers/syntax-checking'
+  \, '+tools/terminal'
   \]
 
   let g:dotspacevim_additional_plugins = [
-  \  'flazz/vim-colorschemes'
+  \  {'name': 'flazz/vim-colorschemes', 'config': {}}
   \]
 
   " let g:dotspacevim_escape_key_sequence = 'fd'
@@ -50,14 +47,14 @@ endif
 " This function is mostly useful for variables that need to be set
 " before plugins are loaded. If you are unsure, you should try in setting
 " them in `dotspacevim/user-config' first."
-  let mapleader = ' '
+  let g:mapleader = ' '
   let g:leaderGuide_vertical = 0
   " Shorten the time before the guide buffer appears
   set timeoutlen=100
 
   " Load external user-init if found
-  if filereadable(config_dir . '/user-init.vim')
-    execute 'source ' . config_dir . '/user-init.vim'
+  if filereadable(s:config_dir . '/user-init.vim')
+    execute 'source ' . s:config_dir . '/user-init.vim'
   endif
 " }}}
 
@@ -75,7 +72,7 @@ call spacevim#bootstrap()
   colorscheme wombat256mod
 
   " Load external user-config if found
-  if filereadable(config_dir . '/user-init.vim')
-    execute 'source ' . config_dir . '/user-config.vim'
+  if filereadable(s:config_dir . '/user-init.vim')
+    execute 'source ' . s:config_dir . '/user-config.vim'
   endif
 " }}}