From 4db39ee4848e67a3400dd9f7ebb6da6c99e3de20 Mon Sep 17 00:00:00 2001
From: Joshua Davey <josh@joshuadavey.com>
Date: Wed, 14 Aug 2013 14:19:16 -0500
Subject: [PATCH] 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.
---
 plugin/fireplace.vim | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/plugin/fireplace.vim b/plugin/fireplace.vim
index 3397337..b8ac972 100644
--- a/plugin/fireplace.vim
+++ b/plugin/fireplace.vim
@@ -1174,11 +1174,29 @@ if !exists('s:leiningen_repl_ports')
   let s:leiningen_repl_ports = {}
 endif
 
-function! s:leiningen_connect()
+function! s:portfile()
   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
   endif
-  let portfile = b:leiningen_root . '/target/repl-port'
+
   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 s:leiningen_repl_ports[b:leiningen_root] = getftime(portfile)