diff --git a/bundle/vimclojure-2.3.4/LICENSE.txt b/bundle/vimclojure-2.3.5/LICENSE.txt similarity index 100% rename from bundle/vimclojure-2.3.4/LICENSE.txt rename to bundle/vimclojure-2.3.5/LICENSE.txt diff --git a/bundle/vimclojure-2.3.4/README.markdown b/bundle/vimclojure-2.3.5/README.markdown similarity index 100% rename from bundle/vimclojure-2.3.4/README.markdown rename to bundle/vimclojure-2.3.5/README.markdown diff --git a/bundle/vimclojure-2.3.4/autoload/vimclojure.vim b/bundle/vimclojure-2.3.5/autoload/vimclojure.vim similarity index 93% rename from bundle/vimclojure-2.3.4/autoload/vimclojure.vim rename to bundle/vimclojure-2.3.5/autoload/vimclojure.vim index 9267b05..7abcb61 100644 --- a/bundle/vimclojure-2.3.4/autoload/vimclojure.vim +++ b/bundle/vimclojure-2.3.5/autoload/vimclojure.vim @@ -520,6 +520,19 @@ 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 @@ -527,17 +540,13 @@ function! vimclojure#DocLookup(word) 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,21 +610,13 @@ 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) @@ -625,9 +624,7 @@ function! vimclojure#GotoSource(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,10 +663,7 @@ 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) @@ -680,10 +671,8 @@ function! vimclojure#RunTests(all) 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) diff --git a/bundle/vimclojure-2.3.4/autoload/vimclojure/util.vim b/bundle/vimclojure-2.3.5/autoload/vimclojure/util.vim similarity index 100% rename from bundle/vimclojure-2.3.4/autoload/vimclojure/util.vim rename to bundle/vimclojure-2.3.5/autoload/vimclojure/util.vim diff --git a/bundle/vimclojure-2.3.4/bin/clj b/bundle/vimclojure-2.3.5/bin/clj similarity index 100% rename from bundle/vimclojure-2.3.4/bin/clj rename to bundle/vimclojure-2.3.5/bin/clj diff --git a/bundle/vimclojure-2.3.4/bin/clj.bat b/bundle/vimclojure-2.3.5/bin/clj.bat similarity index 100% rename from bundle/vimclojure-2.3.4/bin/clj.bat rename to bundle/vimclojure-2.3.5/bin/clj.bat diff --git a/bundle/vimclojure-2.3.4/bin/ng-server b/bundle/vimclojure-2.3.5/bin/ng-server similarity index 100% rename from bundle/vimclojure-2.3.4/bin/ng-server rename to bundle/vimclojure-2.3.5/bin/ng-server diff --git a/bundle/vimclojure-2.3.4/bin/ng-server.bat b/bundle/vimclojure-2.3.5/bin/ng-server.bat similarity index 100% rename from bundle/vimclojure-2.3.4/bin/ng-server.bat rename to bundle/vimclojure-2.3.5/bin/ng-server.bat diff --git a/bundle/vimclojure-2.3.4/doc/clojure.txt b/bundle/vimclojure-2.3.5/doc/clojure.txt similarity index 100% rename from bundle/vimclojure-2.3.4/doc/clojure.txt rename to bundle/vimclojure-2.3.5/doc/clojure.txt diff --git a/bundle/vimclojure-2.3.4/ftdetect/clojure.vim b/bundle/vimclojure-2.3.5/ftdetect/clojure.vim similarity index 100% rename from bundle/vimclojure-2.3.4/ftdetect/clojure.vim rename to bundle/vimclojure-2.3.5/ftdetect/clojure.vim diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure.vim b/bundle/vimclojure-2.3.5/ftplugin/clojure.vim similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure.vim rename to bundle/vimclojure-2.3.5/ftplugin/clojure.vim diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.core.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.core.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.core.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.core.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.data.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.data.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.data.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.data.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.inspector.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.inspector.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.inspector.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.inspector.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.browse.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.browse.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.browse.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.browse.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.io.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.io.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.io.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.io.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.javadoc.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.javadoc.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.javadoc.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.javadoc.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.shell.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.shell.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.java.shell.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.java.shell.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.main.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.main.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.main.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.main.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.pprint.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.pprint.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.pprint.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.pprint.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.repl.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.repl.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.repl.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.repl.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.set.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.set.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.set.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.set.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.stacktrace.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.stacktrace.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.stacktrace.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.stacktrace.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.string.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.string.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.string.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.string.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.template.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.template.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.template.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.template.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.junit.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.junit.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.junit.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.junit.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.tap.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.tap.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.tap.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.tap.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.test.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.test.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.walk.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.walk.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.walk.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.walk.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.xml.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.xml.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.xml.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.xml.txt diff --git a/bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.zip.txt b/bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.zip.txt similarity index 100% rename from bundle/vimclojure-2.3.4/ftplugin/clojure/completions-clojure.zip.txt rename to bundle/vimclojure-2.3.5/ftplugin/clojure/completions-clojure.zip.txt diff --git a/bundle/vimclojure-2.3.4/indent/clojure.vim b/bundle/vimclojure-2.3.5/indent/clojure.vim similarity index 98% rename from bundle/vimclojure-2.3.4/indent/clojure.vim rename to bundle/vimclojure-2.3.5/indent/clojure.vim index 59cafd4..b612176 100644 --- a/bundle/vimclojure-2.3.4/indent/clojure.vim +++ b/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 diff --git a/bundle/vimclojure-2.3.4/plugin/clojure.vim b/bundle/vimclojure-2.3.5/plugin/clojure.vim similarity index 100% rename from bundle/vimclojure-2.3.4/plugin/clojure.vim rename to bundle/vimclojure-2.3.5/plugin/clojure.vim diff --git a/bundle/vimclojure-2.3.4/syntax/clojure.vim b/bundle/vimclojure-2.3.5/syntax/clojure.vim similarity index 100% rename from bundle/vimclojure-2.3.4/syntax/clojure.vim rename to bundle/vimclojure-2.3.5/syntax/clojure.vim