Merge branch 'master' of https://github.com/ayarulin/vim-extest into …

…ayarulin-master

Conflicts:
	Readme.md

Readme.md

@@ -23,9 +23,15 @@ By default extest.vim doesn't bind to any keys but is available in the form of c
 * `:ExTestRunFile` runs all the tests in the file that is loaded into the current buffer
 * `:ExTestRunTest` runs the test case under the cursor
 * `:ExTestRunLast` runs the last test, from any buffer
+* `:ExTestRunCurrentOrLast` runs test case under the cursor or the last test (from any buffer)
 
 If you want to bind those commands to your leader keys, you can do so nevertheless. For example:
 
+```vim
+map <leader>T :ExTestRunFile<CR>
+map <leader>t :ExTestRunCurrentOrLast<CR>
+```
+or:
 ```vim
 map <leader>T :ExTestRunFile<CR>
 map <leader>t :ExTestRunTest<CR>

plugin/extest.vim

@@ -41,6 +41,7 @@ endif
 command ExTestRunFile call <SID>RunFile()
 command ExTestRunTest call <SID>RunTest()
 command ExTestRunLast call <SID>RunLast()
+command ExTestRunCurrentOrLast call <SID>RunCurrentOrLast()
 
 function s:RunFile()
   return s:ExecTestRun("file")
@@ -59,6 +60,17 @@ function s:RunLast()
   return s:RunCommand(g:extest_last_cmd)
 endfunction
 
+function s:RunCurrentOrLast()
+  let l:framework = s:IdentifyFramework()
+
+  if empty(l:framework)
+    return s:RunLast()
+  else
+    return s:RunTest()
+  endif
+endfunction
+
+
 " Starts a test run.
 " @param type ["test" | "file"]
 function s:ExecTestRun(type)