Skip to content
Browse files

Upgraded from VimClojure 2.3.4 to 2.3.5 to fix the resultBuffer bug.

  • Loading branch information...
1 parent 32d337d commit 9900c68c9b1df8d682bf9f17c452698fdb97526b @ctford ctford committed Aug 17, 2012
Showing with 31 additions and 57 deletions.
  1. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/LICENSE.txt
  2. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/README.markdown
  3. +29 −56 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/autoload/vimclojure.vim
  4. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/autoload/vimclojure/util.vim
  5. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/bin/clj
  6. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/bin/clj.bat
  7. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/bin/ng-server
  8. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/bin/ng-server.bat
  9. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/doc/clojure.txt
  10. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftdetect/clojure.vim
  11. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure.vim
  12. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.core.txt
  13. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.data.txt
  14. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.inspector.txt
  15. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.java.browse.txt
  16. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.java.io.txt
  17. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.java.javadoc.txt
  18. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.java.shell.txt
  19. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.main.txt
  20. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.pprint.txt
  21. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.repl.txt
  22. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.set.txt
  23. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.stacktrace.txt
  24. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.string.txt
  25. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.template.txt
  26. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.test.junit.txt
  27. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.test.tap.txt
  28. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.test.txt
  29. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.walk.txt
  30. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.xml.txt
  31. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/ftplugin/clojure/completions-clojure.zip.txt
  32. +2 −1 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/indent/clojure.vim
  33. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/plugin/clojure.vim
  34. 0 bundle/{vimclojure-2.3.4 → vimclojure-2.3.5}/syntax/clojure.vim
View
0 bundle/vimclojure-2.3.4/LICENSE.txt → bundle/vimclojure-2.3.5/LICENSE.txt
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/README.markdown → bundle/vimclojure-2.3.5/README.markdown
File renamed without changes.
View
85 .../vimclojure-2.3.4/autoload/vimclojure.vim → .../vimclojure-2.3.5/autoload/vimclojure.vim
@@ -520,24 +520,33 @@ function! vimclojure#ExecuteNail(nail, ...)
return call(function("vimclojure#ExecuteNailWithInput"), [a:nail, ""] + a:000)
endfunction
+function! vimclojure#ShowResult(result)
+ let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
+ call buf.showOutput(a:result)
+ wincmd p
+endfunction
+
+function! vimclojure#ShowClojureResult(result, nspace)
+ let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
+ let b:vimclojure_namespace = a:nspace
+ call buf.showOutput(a:result)
+ wincmd p
+endfunction
+
function! vimclojure#DocLookup(word)
if a:word == ""
return
endif
let doc = vimclojure#ExecuteNailWithInput("DocLookup", a:word,
\ "-n", b:vimclojure_namespace)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
- call buf.showOutput(doc)
- wincmd p
+ call vimclojure#ShowResult(doc)
endfunction
function! vimclojure#FindDoc()
let pattern = input("Pattern to look for: ")
let doc = vimclojure#ExecuteNailWithInput("FindDoc", pattern)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
- call buf.showOutput(doc)
- wincmd p
+ call vimclojure#ShowResult(doc)
endfunction
let s:DefaultJavadocPaths = {
@@ -579,9 +588,7 @@ function! vimclojure#JavadocLookup(word)
\ "-n", b:vimclojure_namespace)
if path.stderr != ""
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
- call buf.showOutput(path)
- wincmd p
+ call vimclojure#ShowResult(path)
return
endif
@@ -603,31 +610,21 @@ endfunction
function! vimclojure#SourceLookup(word)
let source = vimclojure#ExecuteNailWithInput("SourceLookup", a:word,
\ "-n", b:vimclojure_namespace)
- let ns = b:vimclojure_namespace
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call buf.showOutput(source)
- wincmd p
+ call vimclojure#ShowClojureResult(source, b:vimclojure_namespace)
endfunction
function! vimclojure#MetaLookup(word)
let meta = vimclojure#ExecuteNailWithInput("MetaLookup", a:word,
\ "-n", b:vimclojure_namespace)
- let ns = b:vimclojure_namespace
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call buf.showOutput(meta)
- wincmd p
+ call vimclojure#ShowClojureResult(meta, b:vimclojure_namespace)
endfunction
function! vimclojure#GotoSource(word)
let pos = vimclojure#ExecuteNailWithInput("SourceLocation", a:word,
\ "-n", b:vimclojure_namespace)
if pos.stderr != ""
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
- call buf.showOutput(pos)
- wincmd p
+ call vimclojure#ShowResult(pos)
return
endif
@@ -656,10 +653,7 @@ function! vimclojure#MacroExpand(firstOnly)
let expanded = call(function("vimclojure#ExecuteNailWithInput"), cmd)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call buf.showOutput(expanded)
- wincmd p
+ call vimclojure#ShowClojureResult(expanded, ns)
endfunction
function! vimclojure#RequireFile(all)
@@ -669,21 +663,16 @@ function! vimclojure#RequireFile(all)
let require = "(require :reload" . all . " :verbose '". ns. ")"
let result = vimclojure#ExecuteNailWithInput("Repl", require, "-r")
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! vimclojure#RunTests(all)
let ns = b:vimclojure_namespace
let result = call(function("vimclojure#ExecuteNailWithInput"),
\ [ "RunTests", "", "-n", ns ] + (a:all ? [ "-a" ] : []))
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! vimclojure#EvalFile()
@@ -694,10 +683,7 @@ function! vimclojure#EvalFile()
let result = vimclojure#ExecuteNailWithInput("Repl", content,
\ "-r", "-n", ns, "-f", file)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! vimclojure#EvalLine()
@@ -709,10 +695,7 @@ function! vimclojure#EvalLine()
let result = vimclojure#ExecuteNailWithInput("Repl", content,
\ "-r", "-n", ns, "-f", file, "-l", theLine)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! vimclojure#EvalBlock()
@@ -723,10 +706,7 @@ function! vimclojure#EvalBlock()
let result = vimclojure#ExecuteNailWithInput("Repl", content,
\ "-r", "-n", ns, "-f", file, "-l", line("'<") - 1)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! vimclojure#EvalToplevel()
@@ -737,10 +717,7 @@ function! vimclojure#EvalToplevel()
let result = vimclojure#ExecuteNailWithInput("Repl", expr,
\ "-r", "-n", ns, "-f", file, "-l", pos[0] - 1)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
function! ClojureEvalParagraphWorker() dict
@@ -761,10 +738,7 @@ function! vimclojure#EvalParagraph()
let result = vimclojure#ExecuteNailWithInput("Repl", content,
\ "-r", "-n", ns, "-f", file, "-l", startPosition - 1)
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ClojureResultBuffer)
- let b:vimclojure_namespace = ns
- call resultBuffer.showOutput(result)
- wincmd p
+ call vimclojure#ShowClojureResult(result, ns)
endfunction
" The Repl
@@ -947,8 +921,7 @@ function! vimclojure#Repl.enterHook() dict
if result.value == 0 && result.stderr == ""
call vimclojure#ReplDoEnter()
elseif result.stderr != ""
- let buf = g:vimclojure#ResultWindow.New(g:vimclojure#ResultBuffer)
- call buf.showOutput(result)
+ call vimclojure#ShowResult(result)
else
let result = vimclojure#ExecuteNailWithInput("Repl", cmd,
\ "-r", "-i", self._id)
View
0 ...lojure-2.3.4/autoload/vimclojure/util.vim → ...lojure-2.3.5/autoload/vimclojure/util.vim
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/bin/clj → bundle/vimclojure-2.3.5/bin/clj
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/bin/clj.bat → bundle/vimclojure-2.3.5/bin/clj.bat
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/bin/ng-server → bundle/vimclojure-2.3.5/bin/ng-server
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/bin/ng-server.bat → bundle/vimclojure-2.3.5/bin/ng-server.bat
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/doc/clojure.txt → bundle/vimclojure-2.3.5/doc/clojure.txt
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/ftdetect/clojure.vim → bundle/vimclojure-2.3.5/ftdetect/clojure.vim
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/ftplugin/clojure.vim → bundle/vimclojure-2.3.5/ftplugin/clojure.vim
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.core.txt → ...ugin/clojure/completions-clojure.core.txt
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.data.txt → ...ugin/clojure/completions-clojure.data.txt
File renamed without changes.
View
0 ...clojure/completions-clojure.inspector.txt → ...clojure/completions-clojure.inspector.txt
File renamed without changes.
View
0 ...ojure/completions-clojure.java.browse.txt → ...ojure/completions-clojure.java.browse.txt
File renamed without changes.
View
0 ...n/clojure/completions-clojure.java.io.txt → ...n/clojure/completions-clojure.java.io.txt
File renamed without changes.
View
0 ...jure/completions-clojure.java.javadoc.txt → ...jure/completions-clojure.java.javadoc.txt
File renamed without changes.
View
0 ...lojure/completions-clojure.java.shell.txt → ...lojure/completions-clojure.java.shell.txt
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.main.txt → ...ugin/clojure/completions-clojure.main.txt
File renamed without changes.
View
0 ...in/clojure/completions-clojure.pprint.txt → ...in/clojure/completions-clojure.pprint.txt
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.repl.txt → ...ugin/clojure/completions-clojure.repl.txt
File renamed without changes.
View
0 ...lugin/clojure/completions-clojure.set.txt → ...lugin/clojure/completions-clojure.set.txt
File renamed without changes.
View
0 ...lojure/completions-clojure.stacktrace.txt → ...lojure/completions-clojure.stacktrace.txt
File renamed without changes.
View
0 ...in/clojure/completions-clojure.string.txt → ...in/clojure/completions-clojure.string.txt
File renamed without changes.
View
0 .../clojure/completions-clojure.template.txt → .../clojure/completions-clojure.template.txt
File renamed without changes.
View
0 ...lojure/completions-clojure.test.junit.txt → ...lojure/completions-clojure.test.junit.txt
File renamed without changes.
View
0 .../clojure/completions-clojure.test.tap.txt → .../clojure/completions-clojure.test.tap.txt
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.test.txt → ...ugin/clojure/completions-clojure.test.txt
File renamed without changes.
View
0 ...ugin/clojure/completions-clojure.walk.txt → ...ugin/clojure/completions-clojure.walk.txt
File renamed without changes.
View
0 ...lugin/clojure/completions-clojure.xml.txt → ...lugin/clojure/completions-clojure.xml.txt
File renamed without changes.
View
0 ...lugin/clojure/completions-clojure.zip.txt → ...lugin/clojure/completions-clojure.zip.txt
File renamed without changes.
View
3 bundle/vimclojure-2.3.4/indent/clojure.vim → bundle/vimclojure-2.3.5/indent/clojure.vim
@@ -32,9 +32,10 @@ function! s:MatchPairs(open, close, stopat)
let stopat = a:stopat
endif
- return searchpairpos(a:open, '', a:close, 'bWn',
+ let pos = searchpairpos(a:open, '', a:close, 'bWn',
\ 'vimclojure#util#SynIdName() !~ "clojureParen\\d"',
\ stopat)
+ return [ pos[0], virtcol(pos) ]
endfunction
function! ClojureCheckForStringWorker() dict
View
0 bundle/vimclojure-2.3.4/plugin/clojure.vim → bundle/vimclojure-2.3.5/plugin/clojure.vim
File renamed without changes.
View
0 bundle/vimclojure-2.3.4/syntax/clojure.vim → bundle/vimclojure-2.3.5/syntax/clojure.vim
File renamed without changes.

0 comments on commit 9900c68

Please sign in to comment.
Something went wrong with that request. Please try again.