lavatech/vim-rana
2
0
Fork 0
forked from luna/vim-rana-local
Code Issues Pull requests Releases Wiki Activity

move python discovery code into own function

Browse source
This commit is contained in:
Alan Hamlett 2018-04-03 22:36:37 -07:00
parent a70243be77
commit c9f0c2590d
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
plugin/wakatime.vim
View file

@ -277,23 +277,7 @@ let s:VERSION = '7.0.7'
endif endif
endfunction endfunction
function! s:SendHeartbeats() function! s:GetPythonBinary()
let start_time = localtime()
let stdout = ''
if len(s:heartbeats_buffer) == 0
let s:last_sent = start_time
return
endif
let heartbeat = s:heartbeats_buffer[0]
let s:heartbeats_buffer = s:heartbeats_buffer[1:-1]
if len(s:heartbeats_buffer) > 0
let extra_heartbeats = s:GetHeartbeatsJson()
else
let extra_heartbeats = ''
endif
let python_bin = g:wakatime_PythonBinary let python_bin = g:wakatime_PythonBinary
if !filereadable(python_bin) if !filereadable(python_bin)
let paths = ['python3'] let paths = ['python3']
@ -320,7 +304,27 @@ let s:VERSION = '7.0.7'
if s:IsWindows() && filereadable(printf('%sw', python_bin)) if s:IsWindows() && filereadable(printf('%sw', python_bin))
let python_bin = printf('%sw', python_bin) let python_bin = printf('%sw', python_bin)
endif endif
return python_bin
endfunction
function! s:SendHeartbeats()
let start_time = localtime()
let stdout = ''
if len(s:heartbeats_buffer) == 0
let s:last_sent = start_time
return
endif
let heartbeat = s:heartbeats_buffer[0]
let s:heartbeats_buffer = s:heartbeats_buffer[1:-1]
if len(s:heartbeats_buffer) > 0
let extra_heartbeats = s:GetHeartbeatsJson()
else
let extra_heartbeats = ''
endif
let python_bin = s:GetPythonBinary()
let cmd = [python_bin, '-W', 'ignore', s:cli_location] let cmd = [python_bin, '-W', 'ignore', s:cli_location]
let cmd = cmd + ['--entity', heartbeat.entity] let cmd = cmd + ['--entity', heartbeat.entity]
let cmd = cmd + ['--time', heartbeat.time] let cmd = cmd + ['--time', heartbeat.time]