refactor: change colorscheme config func logic

ui.vim

@@ -26,7 +26,8 @@ endfunction
 function! s:my_theme_dict.gruvbox8() dict abort
   " We should check if theme exists before using it, otherwise you will get
   " error message when starting Nvim
-  if utils#HasColorscheme('gruvbox8')
+  if !utils#HasColorscheme('gruvbox8') | return | endif
+
   " Italic options should be put before colorscheme setting,
   " see https://github.com/morhetz/gruvbox/wiki/Terminal-specific#1-italics-is-disabled
   let g:gruvbox_italics=1
@@ -34,83 +35,82 @@ function! s:my_theme_dict.gruvbox8() dict abort
   let g:gruvbox_filetype_hi_groups = 0
   let g:gruvbox_plugin_hi_groups = 0
   colorscheme gruvbox8_hard
-  endif
 endfunction
 
 function! s:my_theme_dict.srcery() dict abort
-  if utils#HasColorscheme('srcery')
+  if !utils#HasColorscheme('srcery') | return | endif
+
   colorscheme srcery
-  endif
 endfunction
 
 function! s:my_theme_dict.badwolf() dict abort
-  if utils#HasColorscheme('badwolf')
+  if !utils#HasColorscheme('badwolf') | return | endif
+
   let g:badwolf_darkgutter = 0
   " Make the tab line lighter than the background.
   let g:badwolf_tabline = 2
   colorscheme badwolf
-  endif
 endfunction
 
 function! s:my_theme_dict.deus() dict abort
-  if utils#HasColorscheme('deus')
+  if !utils#HasColorscheme('deus') | return | endif
+
   colorscheme deus
-  endif
 endfunction
 
 function! s:my_theme_dict.happy_hacking() dict abort
-  if utils#HasColorscheme('happy_hacking')
+  if !utils#HasColorscheme('happy_hacking') | return | endif
+
   colorscheme happy_hacking
-  endif
 endfunction
 
 function! s:my_theme_dict.solarized8() dict abort
-  if utils#HasColorscheme('solarized8')
+  if !utils#HasColorscheme('solarized8') | return | endif
+
   let g:solarized_term_italics=1
   let g:solarized_visibility='high'
   colorscheme solarized8_flat
-  endif
 endfunction
 
 function! s:my_theme_dict.monokai() dict abort
-  if utils#HasColorscheme('monokai')
+  if !utils#HasColorscheme('monokai') | return | endif
+
   colorscheme monokai
-  endif
 endfunction
 
 function! s:my_theme_dict.gotham() dict abort
-  if utils#HasColorscheme('gotham')
+  if !utils#HasColorscheme('gotham') | return | endif
+
   colorscheme gotham
-  endif
 endfunction
 
 function! s:my_theme_dict.vim_one() dict abort
-  if utils#HasColorscheme('one')
+  if !utils#HasColorscheme('one') | return | endif
+
   let g:one_allow_italics = 1
   colorscheme one
-  endif
 endfunction
 
 function! s:my_theme_dict.material() dict abort
-  if utils#HasColorscheme('material')
+  if !utils#HasColorscheme('material') | return | endif
+
   let g:material_terminal_italics = 1
   " theme_style can be 'default', 'dark' or 'palenight'
   let g:material_theme_style = 'default'
   colorscheme material
-  endif
 endfunction
 
 function! s:my_theme_dict.onedark() dict abort
-  if utils#HasColorscheme('onedark')
+  if !utils#HasColorscheme('onedark') | return | endif
+
   let g:onedark_terminal_italics = 1
   colorscheme onedark
-  endif
 endfunction
 
 function! s:my_theme_dict.neodark() dict abort
-  if utils#HasColorscheme('neodark')
+  if !utils#HasColorscheme('neodark') | return | endif
+
   colorscheme neodark
-  endif
 endfunction
 
 execute printf('call s:my_theme_dict.%s()', s:theme)