refactor: make commands globally available (#59)

Author: stevearc

autoload/arduino.vim

@@ -25,6 +25,11 @@ let s:SKETCHFILE = v:null
 " Initialization {{{1
 " Set up all user configuration variables
 function! arduino#InitializeConfig() abort
+  if exists('g:arduino_did_initialize')
+    return
+  endif
+  call arduino#LoadCache()
+
   if !exists('g:arduino_board')
     if exists('g:_cache_arduino_board')
       let g:arduino_board = g:_cache_arduino_board
@@ -87,6 +92,7 @@ function! arduino#InitializeConfig() abort
     au!
     au BufReadPost *.ino call s:ReadSketchJson(expand('<amatch>:p:h'))
   aug END
+  let g:arduino_did_initialize = 1
 endfunction
 
 function! arduino#RunCmd(cmd) abort
@@ -429,6 +435,7 @@ function! s:ChooserItemOrder(i1, i2) abort
 endfunction
 
 function! arduino#Attach(...) abort
+  call arduino#InitializeConfig()
   if !s:has_cli
     echoerr 'ArduinoAttach requires arduino-cli'
     return
@@ -457,6 +464,7 @@ endfunction
 " Port selection {{{2
 
 function! arduino#ChoosePort(...) abort
+  call arduino#InitializeConfig()
   if a:0
     let g:arduino_serial_port = a:1
     return
@@ -480,6 +488,7 @@ let s:callback_data = {}
 
 " Display a list of boards to the user and allow them to choose the active one
 function! arduino#ChooseBoard(...) abort
+  call arduino#InitializeConfig()
   if a:0
     call arduino#SetBoard(a:1)
     return
@@ -532,6 +541,7 @@ endfunction
 " Programmer selection {{{2
 
 function! arduino#ChooseProgrammer(...) abort
+  call arduino#InitializeConfig()
   if a:0
     call arduino#SetProgrammer(a:1)
     return
@@ -567,6 +577,7 @@ function! arduino#SetBoard(board, ...) abort
 endfunction
 
 function! arduino#Verify() abort
+  call arduino#InitializeConfig()
   if g:arduino_use_cli
     let cmd = arduino#GetCLICompileCommand()
   else
@@ -578,6 +589,7 @@ function! arduino#Verify() abort
 endfunction
 
 function! arduino#Upload() abort
+  call arduino#InitializeConfig()
   if g:arduino_use_cli
     let cmd = arduino#GetCLICompileCommand('-u')
   else
@@ -594,13 +606,15 @@ function! arduino#Upload() abort
 endfunction
 
 function! arduino#Serial() abort
+  call arduino#InitializeConfig()
   let cmd = arduino#GetSerialCmd()
   if empty(cmd) | return | endif
 
   call arduino#RunCmd(cmd)
 endfunction
 
 function! arduino#UploadAndSerial()
+  call arduino#InitializeConfig()
   " Since 'terminal!' is non-blocking '!' must be used to provide this functionality
   let termBackup = s:TERM
   let s:TERM = '!'
@@ -748,6 +762,7 @@ endfunction
 
 " Print the current configuration
 function! arduino#GetInfo() abort
+  call arduino#InitializeConfig()
   let port = arduino#GetPort()
   if empty(port)
       let port = 'none'

ftplugin/arduino.vim

@@ -2,11 +2,7 @@ if exists('b:did_arduino_ftplugin')
   finish
 endif
 let b:did_arduino_ftplugin = 1
-if !exists('g:arduino_did_initialize')
-  call arduino#LoadCache()
-  call arduino#InitializeConfig()
-  let g:arduino_did_initialize = 1
-endif
+call arduino#InitializeConfig()
 
 " Use C rules for indentation
 setl cindent
@@ -19,15 +15,3 @@ if g:arduino_auto_baud
     au BufReadPost,BufWritePost *.ino call arduino#SetAutoBaud()
   aug END
 endif
-
-command! -buffer -bar -nargs=? ArduinoAttach call arduino#Attach(<f-args>)
-command! -buffer -bar -nargs=? ArduinoChooseBoard call arduino#ChooseBoard(<f-args>)
-command! -buffer -bar -nargs=? ArduinoChooseProgrammer call arduino#ChooseProgrammer(<f-args>)
-command! -buffer -bar ArduinoVerify call arduino#Verify()
-command! -buffer -bar ArduinoUpload call arduino#Upload()
-command! -buffer -bar ArduinoSerial call arduino#Serial()
-command! -buffer -bar ArduinoUploadAndSerial call arduino#UploadAndSerial()
-command! -buffer -bar ArduinoGetInfo call arduino#GetInfo()
-command! -buffer -bar ArduinoInfo call arduino#GetInfo()
-command! -buffer -bar -nargs=? ArduinoChoosePort call arduino#ChoosePort(<f-args>)
-command! -buffer -bar -nargs=1 ArduinoSetBaud call arduino#SetBaud(<f-args>)

plugin/arduino.vim

@@ -0,0 +1,11 @@
+command! -buffer -bar -nargs=? ArduinoAttach call arduino#Attach(<f-args>)
+command! -buffer -bar -nargs=? ArduinoChooseBoard call arduino#ChooseBoard(<f-args>)
+command! -buffer -bar -nargs=? ArduinoChooseProgrammer call arduino#ChooseProgrammer(<f-args>)
+command! -buffer -bar ArduinoVerify call arduino#Verify()
+command! -buffer -bar ArduinoUpload call arduino#Upload()
+command! -buffer -bar ArduinoSerial call arduino#Serial()
+command! -buffer -bar ArduinoUploadAndSerial call arduino#UploadAndSerial()
+command! -buffer -bar ArduinoGetInfo call arduino#GetInfo()
+command! -buffer -bar ArduinoInfo call arduino#GetInfo()
+command! -buffer -bar -nargs=? ArduinoChoosePort call arduino#ChoosePort(<f-args>)
+command! -buffer -bar -nargs=1 ArduinoSetBaud call arduino#SetBaud(<f-args>)