Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

upgrade to vimclojure 2.3.3

  • Loading branch information...
commit ba85287b9cfd7a2bbdc9d1e5fb92e0ad14d38cec 1 parent da5158c
@daveray authored
Showing with 119 additions and 96 deletions.
  1. +0 −38 bundle/vimclojure-2.3.0/bin/kickoff.sh
  2. BIN  bundle/vimclojure-2.3.0/lib/server-2.3.0.jar
  3. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/LICENSE.txt
  4. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/README.markdown
  5. +44 −29 bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/autoload/vimclojure.vim
  6. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/autoload/vimclojure/util.vim
  7. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/bin/clj
  8. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/bin/clj.bat
  9. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/bin/ng-server
  10. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/bin/ng-server.bat
  11. +48 −9 bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/doc/clojure.txt
  12. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftdetect/clojure.vim
  13. +1 −0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure.vim
  14. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.core.txt
  15. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.data.txt
  16. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.inspector.txt
  17. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.java.browse.txt
  18. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.java.io.txt
  19. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.java.javadoc.txt
  20. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.java.shell.txt
  21. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.main.txt
  22. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.pprint.txt
  23. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.repl.txt
  24. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.set.txt
  25. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.stacktrace.txt
  26. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.string.txt
  27. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.template.txt
  28. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.test.junit.txt
  29. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.test.tap.txt
  30. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.test.txt
  31. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.walk.txt
  32. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.xml.txt
  33. 0  bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/ftplugin/clojure/completions-clojure.zip.txt
  34. +15 −6 bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/indent/clojure.vim
  35. +6 −6 bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/plugin/clojure.vim
  36. +3 −1 bundle/{vimclojure-2.3.0 → vimclojure-2.3.3}/syntax/clojure.vim
  37. 0  {bundle/vimclojure-2.3.0 → }/lib/nailgun/.gitignore
  38. 0  {bundle/vimclojure-2.3.0 → }/lib/nailgun/Makefile
  39. 0  {bundle/vimclojure-2.3.0 → }/lib/nailgun/ng.exe
  40. 0  {bundle/vimclojure-2.3.0 → }/lib/nailgun/ngclient/ng.c
  41. +2 −7 vimrc.vim
View
38 bundle/vimclojure-2.3.0/bin/kickoff.sh
@@ -1,38 +0,0 @@
-#! /usr/bin/env bash
-
-GRADLE_REV="0.8"
-GRADLE_URL="http://dist.codehaus.org/gradle/gradle-${GRADLE_REV}-bin.zip"
-GRADLE_ZIP="gradle.zip"
-GRADLE_DIR="gradle-${GRADLE_REV}"
-
-PLUGIN_REV="1.3.0"
-PLUGIN_URL="http://clojars.org/repo/clojuresque/clojuresque/${PLUGIN_REV}/clojuresque-${PLUGIN_REV}.jar"
-PLUGIN_JAR="clojuresque-${PLUGIN_REV}.jar"
-
-CACHE_DIR="cache"
-CACHE_GRADLE_ZIP="${CACHE_DIR}/${GRADLE_ZIP}"
-CACHE_GRADLE_DIR="${CACHE_DIR}/${GRADLE_DIR}"
-
-if [ ! -e "${CACHE_DIR}" ]; then
- mkdir "${CACHE_DIR}"
-fi
-
-if [ ! -e "${CACHE_GRADLE_ZIP}" ]; then
- wget ${GRADLE_URL} -O "${CACHE_GRADLE_ZIP}"
-fi
-
-if [ ! -e "${CACHE_GRADLE_DIR}" ]; then
- pushd .
- cd "${CACHE_DIR}"
- unzip "${GRADLE_ZIP}"
- popd
-fi
-
-if [ ! -e "${CACHE_PLUGIN_DIR}" ]; then
- wget ${PLUGIN_URL} -O "${CACHE_GRADLE_DIR}/lib/${PLUGIN_JAR}"
-fi
-
-echo "clojure=clojuresque.ClojurePlugin" >> "${CACHE_GRADLE_DIR}/plugin.properties"
-
-echo "Don't forget to set GRADLE_HOME!"
-echo "export GRADLE_HOME=\"${CACHE_GRADLE_DIR}\""
View
BIN  bundle/vimclojure-2.3.0/lib/server-2.3.0.jar
Binary file not shown
View
0  bundle/vimclojure-2.3.0/LICENSE.txt → bundle/vimclojure-2.3.3/LICENSE.txt
File renamed without changes
View
0  bundle/vimclojure-2.3.0/README.markdown → bundle/vimclojure-2.3.3/README.markdown
File renamed without changes
View
73 bundle/vimclojure-2.3.0/autoload/vimclojure.vim → bundle/vimclojure-2.3.3/autoload/vimclojure.vim
@@ -17,6 +17,10 @@ if !exists("g:vimclojure#FuzzyIndent")
let vimclojure#FuzzyIndent = 0
endif
+if !exists("g:vimclojure#FuzzyIndentPatterns")
+ let vimclojure#FuzzyIndentPatterns = "with.*,def.*,let.*"
+endif
+
if !exists("g:vimclojure#HighlightBuiltins")
if exists("g:clj_highlight_builtins")
call vimclojure#WarnDeprecated("g:clj_highlight_builtins",
@@ -75,6 +79,14 @@ if !exists("g:vimclojure#UseErrorBuffer")
let vimclojure#UseErrorBuffer = 1
endif
+if !exists("g:vimclojure#SetupKeyMap")
+ let vimclojure#SetupKeyMap = 1
+endif
+
+if !exists("g:vimclojure#SearchThreshold")
+ let vimclojure#SearchThreshold = 100
+endif
+
function! vimclojure#ReportError(msg)
if g:vimclojure#UseErrorBuffer
let buf = g:vimclojure#ResultBuffer.New()
@@ -148,34 +160,29 @@ function! vimclojure#BufferName()
endfunction
" Key mappings and Plugs
-function! vimclojure#MakePlug(mode, plug, f, args)
- if a:mode == "i"
- let esc = "<ESC>"
- else
- let esc = ""
- endif
-
- execute a:mode . "noremap <Plug>Clojure" . a:plug
- \ . " " . esc . ":call " . a:f . "(" . a:args . ")<CR>"
-endfunction
-
function! vimclojure#MakeProtectedPlug(mode, plug, f, args)
- execute a:mode . "noremap <Plug>Clojure" . a:plug
- \ . " :call vimclojure#ProtectedPlug(function(\""
+ execute a:mode . "noremap <Plug>Clojure" . a:plug . "."
+ \ . " :<C-U>call vimclojure#ProtectedPlug(function(\""
\ . a:f . "\"), [ " . a:args . " ])<CR>"
endfunction
function! vimclojure#MakeCommandPlug(mode, plug, f, args)
- execute a:mode . "noremap <Plug>Clojure" . a:plug
- \ . " :call vimclojure#ProtectedPlug("
+ execute a:mode . "noremap <Plug>Clojure" . a:plug . "."
+ \ . " :<C-U>call vimclojure#ProtectedPlug("
\ . " function(\"vimclojure#CommandPlug\"),"
\ . " [ function(\"" . a:f . "\"), [ " . a:args . " ]])<CR>"
endfunction
function! vimclojure#MapPlug(mode, keys, plug)
- if !hasmapto("<Plug>Clojure" . a:plug, a:mode)
+ if exists("g:vimclojure#SetupKeyMap" . a:plug)
+ execute "let doSetup = g:vimclojure#SetupKeyMap" . a:plug
+ else
+ let doSetup = g:vimclojure#SetupKeyMap
+ endif
+
+ if doSetup && !hasmapto("<Plug>Clojure" . a:plug . ".", a:mode)
execute a:mode . "map <buffer> <unique> <silent> <LocalLeader>" . a:keys
- \ . " <Plug>Clojure" . a:plug
+ \ . " <Plug>Clojure" . a:plug . "."
endif
endfunction
@@ -287,7 +294,9 @@ endfunction
function! vimclojure#Buffer.showText(text) dict
call self.goHere()
if type(a:text) == type("")
- let text = split(a:text, '\n')
+ " XXX: Opening the box of the pandora.
+ " 2012-01-09: Adding Carriage Returns here.
+ let text = split(a:text, '\r\?\n')
else
let text = a:text
endif
@@ -655,7 +664,7 @@ function! vimclojure#EvalBlock()
let file = vimclojure#BufferName()
let ns = b:vimclojure_namespace
- let content = getbufline(bufnr("%"), line("'<"), line("'>"))
+ let content = vimclojure#util#Yank("l", 'normal! gv"ly')
let result = vimclojure#ExecuteNailWithInput("Repl", content,
\ "-r", "-n", ns, "-f", file, "-l", line("'<") - 1)
@@ -704,6 +713,7 @@ endfunction
let vimclojure#Repl = copy(vimclojure#Buffer)
let vimclojure#Repl.__superBufferNew = vimclojure#Repl.New
let vimclojure#Repl.__superBufferInit = vimclojure#Repl.Init
+let vimclojure#Repl.__superBufferClear = vimclojure#Repl.clear
let vimclojure#Repl._history = []
let vimclojure#Repl._historyDepth = 0
@@ -749,20 +759,20 @@ function! vimclojure#Repl.Init(namespace) dict
set filetype=clojure
let b:vimclojure_namespace = a:namespace
- if !hasmapto("<Plug>ClojureReplEnterHook", "i")
- imap <buffer> <silent> <CR> <Plug>ClojureReplEnterHook
+ if !hasmapto("<Plug>ClojureReplEnterHook.", "i")
+ imap <buffer> <silent> <CR> <Plug>ClojureReplEnterHook.
endif
- if !hasmapto("<Plug>ClojureReplEvaluate", "i")
- imap <buffer> <silent> <C-CR> <Plug>ClojureReplEvaluate
+ if !hasmapto("<Plug>ClojureReplEvaluate.", "i")
+ imap <buffer> <silent> <C-CR> <Plug>ClojureReplEvaluate.
endif
- if !hasmapto("<Plug>ClojureReplHatHook", "n")
- nmap <buffer> <silent> ^ <Plug>ClojureReplHatHook
+ if !hasmapto("<Plug>ClojureReplHatHook.", "n")
+ nmap <buffer> <silent> ^ <Plug>ClojureReplHatHook.
endif
- if !hasmapto("<Plug>ClojureReplUpHistory", "i")
- imap <buffer> <silent> <C-Up> <Plug>ClojureReplUpHistory
+ if !hasmapto("<Plug>ClojureReplUpHistory.", "i")
+ imap <buffer> <silent> <C-Up> <Plug>ClojureReplUpHistory.
endif
- if !hasmapto("<Plug>ClojureReplDownHistory", "i")
- imap <buffer> <silent> <C-Down> <Plug>ClojureReplDownHistory
+ if !hasmapto("<Plug>ClojureReplDownHistory.", "i")
+ imap <buffer> <silent> <C-Down> <Plug>ClojureReplDownHistory.
endif
normal! G
@@ -810,6 +820,11 @@ function! vimclojure#Repl.showPrompt() dict
startinsert!
endfunction
+function! vimclojure#Repl.clear() dict
+ call self.__superBufferClear()
+ call self.showPrompt()
+endfunction
+
function! vimclojure#Repl.getCommand() dict
let ln = line("$")
View
0  bundle/vimclojure-2.3.0/autoload/vimclojure/util.vim → bundle/vimclojure-2.3.3/autoload/vimclojure/util.vim
File renamed without changes
View
0  bundle/vimclojure-2.3.0/bin/clj → bundle/vimclojure-2.3.3/bin/clj
File renamed without changes
View
0  bundle/vimclojure-2.3.0/bin/clj.bat → bundle/vimclojure-2.3.3/bin/clj.bat
File renamed without changes
View
0  bundle/vimclojure-2.3.0/bin/ng-server → bundle/vimclojure-2.3.3/bin/ng-server
File renamed without changes
View
0  bundle/vimclojure-2.3.0/bin/ng-server.bat → bundle/vimclojure-2.3.3/bin/ng-server.bat
File renamed without changes
View
57 bundle/vimclojure-2.3.0/doc/clojure.txt → bundle/vimclojure-2.3.3/doc/clojure.txt
@@ -120,13 +120,37 @@ to the 'lispwords' option. The names of these forms often follow a
pattern like "defsomething" or "with-something".
By setting the fuzzy indent option, you can tell VimClojure, that you
-want names beginning in "def" or "with" to be indented as if they
+want names matching a fuzzy indent pattern to be indented as if they
were included in the 'lispwords' option.
>
let vimclojure#FuzzyIndent = 1
<
This option is disabled by default.
+Custom fuzzy indent patterns may be specified as normal regular expressions
+in the corresponding option. The patterns are matched against the leading
+symbol of the form in a way to ignore namespace aliases. The default
+patterns are “def.*”, “with.*” and “let.*”.
+
+For example, consider working a lot with core.logic. Then you may specify
+eg. “fresh” in .vim/after/ftplugin/clojure.vim.
+>
+ let vimclojure#FuzzyIndentPatterns .= ",fresh"
+<
+Note: this is a normal variable. So you have to use “.=” rather than
+“+=” and the comma separator has to be given explicitly.
+
+To be able to properly indent a given line there is some searching
+necessary to determine the surroundings of the cursor. In big files
+this my result in a slow down when entering a new line. So there is
+an option to basically limit the horizon which is searched for the
+indentation to synchronise. By default this is 100 lines backwards in
+the file. However you may specify whatever value works best for you.
+Higher values mean more searching.
+>
+ let vimclojure#SearchThreshold = 100
+<
+
Preview Window
--------------
@@ -146,11 +170,26 @@ Note: <LocalLeader> is a Vim feature. More information can be found
under the |maplocalleader| help topic.
You can redefine any key mapping using some autocommand in your .vimrc file.
-All mappings use so-called Plugs. Simply prepend <Plug>Clojure to the given
-Plug name and your setting will override the default mapping.
+All mappings use so-called Plugs. Simply prepend "<Plug>Clojure" to the given
+Plug name, append a "." and your setting will override the default mapping.
+>
+ aucmd BufRead,BufNewFile *.clj nmap xyz <Plug>ClojureEvalToplevel.
+<
+To inhibit all mappings set the global flag to zero:
+>
+ let vimclojure#SetupKeyMap = 0
+<
+To inhibit only single mappings append the plug name:
+>
+ let vimclojure#SetupKeyMapEvalToplevel = 0
+<
+To enable only single mappings first turn off all flags, and then
+whitelist the ones you want to be enabled:
>
- aucmd BufRead,BufNewFile *.clj nmap xyz <Plug>ClojureEvalToplevel
+ let vimclojure#SetupKeyMap = 0
+ let vimclojure#SetupKeyMapEvalToplevel = 1
<
+Whatever setting: it will still honor any key mapping made by yourself.
<LocalLeader>et *et* *EvalToplevel*
Send off the toplevel sexpression currently
@@ -301,11 +340,11 @@ If the current line starts with a repl prompt, the *^* command moves to
the end of the prompt and to the beginning of the line.
The Plugs are:
- - <Plug>ClojureReplEnterHook for the enter key
- - <Plug>ClojureReplEvaluate for immediate evaluation (<C-CR>)
- - <Plug>ClojureReplHatHook for ^ navigation
- - <Plug>ClojureReplUpHistory for going backwards in history (<C-Up>)
- - <Plug>ClojureReplDownHistory for going forwards in history (<C-Down>)
+ - <Plug>ClojureReplEnterHook. for the enter key
+ - <Plug>ClojureReplEvaluate. for immediate evaluation (<C-CR>)
+ - <Plug>ClojureReplHatHook. for ^ navigation
+ - <Plug>ClojureReplUpHistory. for going backwards in history (<C-Up>)
+ - <Plug>ClojureReplDownHistory. for going forwards in history (<C-Down>)
The following convenience commands are provided:
View
0  bundle/vimclojure-2.3.0/ftdetect/clojure.vim → bundle/vimclojure-2.3.3/ftdetect/clojure.vim
File renamed without changes
View
1  bundle/vimclojure-2.3.0/ftplugin/clojure.vim → bundle/vimclojure-2.3.3/ftplugin/clojure.vim
@@ -137,6 +137,7 @@ if exists("b:vimclojure_namespace")
setlocal omnifunc=vimclojure#OmniCompletion
augroup VimClojure
+ au!
autocmd CursorMovedI <buffer> if pumvisible() == 0 | pclose | endif
augroup END
endif
View
0  ...3.0/ftplugin/clojure/completions-clojure.core.txt → ...3.3/ftplugin/clojure/completions-clojure.core.txt
File renamed without changes
View
0  ...3.0/ftplugin/clojure/completions-clojure.data.txt → ...3.3/ftplugin/clojure/completions-clojure.data.txt
File renamed without changes
View
0  ...tplugin/clojure/completions-clojure.inspector.txt → ...tplugin/clojure/completions-clojure.inspector.txt
File renamed without changes
View
0  ...lugin/clojure/completions-clojure.java.browse.txt → ...lugin/clojure/completions-clojure.java.browse.txt
File renamed without changes
View
0  .../ftplugin/clojure/completions-clojure.java.io.txt → .../ftplugin/clojure/completions-clojure.java.io.txt
File renamed without changes
View
0  ...ugin/clojure/completions-clojure.java.javadoc.txt → ...ugin/clojure/completions-clojure.java.javadoc.txt
File renamed without changes
View
0  ...plugin/clojure/completions-clojure.java.shell.txt → ...plugin/clojure/completions-clojure.java.shell.txt
File renamed without changes
View
0  ...3.0/ftplugin/clojure/completions-clojure.main.txt → ...3.3/ftplugin/clojure/completions-clojure.main.txt
File renamed without changes
View
0  ...0/ftplugin/clojure/completions-clojure.pprint.txt → ...3/ftplugin/clojure/completions-clojure.pprint.txt
File renamed without changes
View
0  ...3.0/ftplugin/clojure/completions-clojure.repl.txt → ...3.3/ftplugin/clojure/completions-clojure.repl.txt
File renamed without changes
View
0  ....3.0/ftplugin/clojure/completions-clojure.set.txt → ....3.3/ftplugin/clojure/completions-clojure.set.txt
File renamed without changes
View
0  ...plugin/clojure/completions-clojure.stacktrace.txt → ...plugin/clojure/completions-clojure.stacktrace.txt
File renamed without changes
View
0  ...0/ftplugin/clojure/completions-clojure.string.txt → ...3/ftplugin/clojure/completions-clojure.string.txt
File renamed without changes
View
0  ...ftplugin/clojure/completions-clojure.template.txt → ...ftplugin/clojure/completions-clojure.template.txt
File renamed without changes
View
0  ...plugin/clojure/completions-clojure.test.junit.txt → ...plugin/clojure/completions-clojure.test.junit.txt
File renamed without changes
View
0  ...ftplugin/clojure/completions-clojure.test.tap.txt → ...ftplugin/clojure/completions-clojure.test.tap.txt
File renamed without changes
View
0  ...3.0/ftplugin/clojure/completions-clojure.test.txt → ...3.3/ftplugin/clojure/completions-clojure.test.txt
File renamed without changes
View
0  ...3.0/ftplugin/clojure/completions-clojure.walk.txt → ...3.3/ftplugin/clojure/completions-clojure.walk.txt
File renamed without changes
View
0  ....3.0/ftplugin/clojure/completions-clojure.xml.txt → ....3.3/ftplugin/clojure/completions-clojure.xml.txt
File renamed without changes
View
0  ....3.0/ftplugin/clojure/completions-clojure.zip.txt → ....3.3/ftplugin/clojure/completions-clojure.zip.txt
File renamed without changes
View
21 bundle/vimclojure-2.3.0/indent/clojure.vim → bundle/vimclojure-2.3.3/indent/clojure.vim
@@ -26,9 +26,15 @@ if exists("*searchpairpos")
function! s:MatchPairs(open, close, stopat)
" Stop only on vector and map [ resp. {. Ignore the ones in strings and
" comments.
+ if a:stopat == 0
+ let stopat = max([line(".") - g:vimclojure#SearchThreshold, 0])
+ else
+ let stopat = a:stopat
+ endif
+
return searchpairpos(a:open, '', a:close, 'bWn',
\ 'vimclojure#util#SynIdName() !~ "clojureParen\\d"',
- \ a:stopat)
+ \ stopat)
endfunction
function! ClojureCheckForStringWorker() dict
@@ -97,7 +103,7 @@ function! ClojureIsMethodSpecialCaseWorker() dict
call vimclojure#util#MoveForward()
let keyword = vimclojure#util#Yank('l', 'normal! "lye')
if index([ 'deftype', 'defrecord', 'reify', 'proxy',
- \ 'extend', 'extend-type', 'extend-protocol',
+ \ 'extend-type', 'extend-protocol',
\ 'letfn' ], keyword) >= 0
return 1
endif
@@ -208,10 +214,13 @@ function! GetClojureIndent()
if g:vimclojure#FuzzyIndent
\ && w != 'with-meta'
\ && w != 'clojure.core/with-meta'
- \ && w =~ '\(^\|/\)\(def\|with\)'
- \ && w !~ '\(^\|/\)\(def\|with\).*\*$'
- \ && w !~ '\(^\|/\)\(def\|with\).*-fn$'
- return paren[1] + &shiftwidth - 1
+ for pat in split(g:vimclojure#FuzzyIndentPatterns, ",")
+ if w =~ '\(^\|/\)' . pat . '$'
+ \ && w !~ '\(^\|/\)' . pat . '\*$'
+ \ && w !~ '\(^\|/\)' . pat . '-fn$'
+ return paren[1] + &shiftwidth - 1
+ endif
+ endfor
endif
normal! w
View
12 bundle/vimclojure-2.3.0/plugin/clojure.vim → bundle/vimclojure-2.3.3/plugin/clojure.vim
@@ -49,12 +49,12 @@ call vimclojure#MakeCommandPlug("n", "EvalParagraph", "vimclojure#EvalParagraph"
call vimclojure#MakeCommandPlug("n", "StartRepl", "vimclojure#StartRepl", "")
call vimclojure#MakeCommandPlug("n", "StartLocalRepl", "vimclojure#StartRepl", "b:vimclojure_namespace")
-inoremap <Plug>ClojureReplEnterHook <Esc>:call b:vimclojure_repl.enterHook()<CR>
-inoremap <Plug>ClojureReplEvaluate <Esc>G$:call b:vimclojure_repl.enterHook()<CR>
-nnoremap <Plug>ClojureReplHatHook :call b:vimclojure_repl.hatHook()<CR>
-inoremap <Plug>ClojureReplUpHistory <C-O>:call b:vimclojure_repl.upHistory()<CR>
-inoremap <Plug>ClojureReplDownHistory <C-O>:call b:vimclojure_repl.downHistory()<CR>
+inoremap <Plug>ClojureReplEnterHook. <Esc>:call b:vimclojure_repl.enterHook()<CR>
+inoremap <Plug>ClojureReplEvaluate. <Esc>G$:call b:vimclojure_repl.enterHook()<CR>
+nnoremap <Plug>ClojureReplHatHook. :call b:vimclojure_repl.hatHook()<CR>
+inoremap <Plug>ClojureReplUpHistory. <C-O>:call b:vimclojure_repl.upHistory()<CR>
+inoremap <Plug>ClojureReplDownHistory. <C-O>:call b:vimclojure_repl.downHistory()<CR>
-nnoremap <Plug>ClojureCloseResultBuffer :call vimclojure#ResultBuffer.CloseBuffer()<CR>
+nnoremap <Plug>ClojureCloseResultBuffer. :call vimclojure#ResultBuffer.CloseBuffer()<CR>
let &cpo = s:cpo_save
View
4 bundle/vimclojure-2.3.0/syntax/clojure.vim → bundle/vimclojure-2.3.3/syntax/clojure.vim
@@ -182,7 +182,7 @@ syn cluster clojureTopCluster contains=@clojureAtomCluster,clojureComment,clo
syn keyword clojureTodo contained FIXME XXX TODO FIXME: XXX: TODO:
syn match clojureComment contains=clojureTodo ";.*$"
-syn match clojureKeyword "\c:\{1,2}[a-z?!\-_+*./=<>#$][a-z0-9?!\-_+*\./=<>#$]*"
+syn match clojureKeyword "\c:\{1,2}[a-z0-9?!\-_+*.=<>#$]\+\(/[a-z0-9?!\-_+*.=<>#$]\+\)\?"
syn region clojureString start=/L\="/ skip=/\\\\\|\\"/ end=/"/
@@ -211,6 +211,7 @@ syn match clojureNumber "\<-\=[0-9]\+/[0-9]\+\>"
syn match clojureQuote "\('\|`\)"
syn match clojureUnquote "\(\~@\|\~\)"
syn match clojureDispatch "\(#^\|#'\)"
+syn match clojureDispatch "\^"
syn match clojureAnonArg contained "%\(\d\|&\)\?"
syn match clojureVarArg contained "&"
@@ -336,6 +337,7 @@ if vimclojure#ParenRainbow != 0
call VimClojureSetupParenRainbow()
augroup VimClojureSyntax
+ au!
autocmd ColorScheme * if &ft == "clojure" | call VimClojureSetupParenRainbow() | endif
augroup END
else
View
0  bundle/vimclojure-2.3.0/lib/nailgun/.gitignore → lib/nailgun/.gitignore
File renamed without changes
View
0  bundle/vimclojure-2.3.0/lib/nailgun/Makefile → lib/nailgun/Makefile
File renamed without changes
View
0  bundle/vimclojure-2.3.0/lib/nailgun/ng.exe → lib/nailgun/ng.exe
File renamed without changes
View
0  bundle/vimclojure-2.3.0/lib/nailgun/ngclient/ng.c → lib/nailgun/ngclient/ng.c
File renamed without changes
View
9 vimrc.vim
@@ -517,7 +517,7 @@ endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" vimclojure stuff
" Settings for VimClojure
-let vimclojureRoot = vimfiles."/bundle/vimclojure-2.3.0"
+let vimclojureRoot = vimfiles."/bundle/vimclojure-2.3.3"
let vimclojure#FuzzyIndent=1
let vimclojure#HighlightBuiltins=1
let vimclojure#HighlightContrib=1
@@ -525,17 +525,12 @@ let vimclojure#DynamicHighlighting=1
let vimclojure#ParenRainbow=1
let vimclojure#WantNailgun = 1
let vimclojure#SplitSize = 7
-let vimclojure#NailgunClient = vimclojureRoot."/lib/nailgun/ng"
+let vimclojure#NailgunClient = vimfiles."/lib/nailgun/ng"
if windows
" In stupid windows, no forward slashes, and tack on .exe
let vimclojure#NailgunClient = substitute(vimclojure#NailgunClient, "/", "\\", "g") . ".exe"
endif
-" Start vimclojure nailgun server (uses screen.vim to manage lifetime)
-nmap <silent> <Leader>sc :execute Screen_java("vimclojure.nailgun.NGServer 127.0.0.1", [vimclojureRoot . "/lib/*"]) <cr>
-" Start a generic Clojure repl (uses screen.vim)
-nmap <silent> <Leader>sC :execute Screen_java("clojure.main", []) <cr>
-
" Add more macro-y words
autocmd FileType clojure setlocal lispwords+=describe,it,testing,facts,fact,provided
Please sign in to comment.
Something went wrong with that request. Please try again.