Search for repl-port file in common places

As of Leiningen 2.3, different profiles activate different target
sub-directories. In the case of the repl, that means the repl-port file
is now located at target/repl/repl-port.
This commit is contained in:
Joshua Davey 2013-08-14 14:19:16 -05:00
parent 0127e5fc54
commit 4db39ee484

View File

@ -1174,11 +1174,29 @@ if !exists('s:leiningen_repl_ports')
let s:leiningen_repl_ports = {} let s:leiningen_repl_ports = {}
endif endif
function! s:leiningen_connect() function! s:portfile()
if !exists('b:leiningen_root') if !exists('b:leiningen_root')
return ''
endif
let root = b:leiningen_root
let portfiles = [root.'/target/repl-port', root.'/target/repl/repl-port']
for f in portfiles
if filereadable(f)
return f
endif
endfor
return ''
endfunction
function! s:leiningen_connect()
let portfile = s:portfile()
if empty(portfile)
return return
endif endif
let portfile = b:leiningen_root . '/target/repl-port'
if getfsize(portfile) > 0 && getftime(portfile) !=# get(s:leiningen_repl_ports, b:leiningen_root, -1) if getfsize(portfile) > 0 && getftime(portfile) !=# get(s:leiningen_repl_ports, b:leiningen_root, -1)
let port = matchstr(readfile(portfile, 'b', 1)[0], '\d\+') let port = matchstr(readfile(portfile, 'b', 1)[0], '\d\+')
let s:leiningen_repl_ports[b:leiningen_root] = getftime(portfile) let s:leiningen_repl_ports[b:leiningen_root] = getftime(portfile)