Skip to content
Browse files

Goodbye Slimv, hello Fireplace

  • Loading branch information...
1 parent cf0ee56 commit 887183ddd8ea487726bc387fb6ea909a1cc83cbf @sjl committed Jun 14, 2013
Showing with 216 additions and 113 deletions.
  1. +28 −23 bin/lein
  2. +48 −0 vim/after/plugin/fireplace.vim
  3. +1 −0 vim/bundle/fireplace
  4. +1 −0 vim/bundle/rainbow-parens
  5. +1 −0 vim/bundle/vim-clojure-static
  6. +128 −0 vim/ftplugin/clojure/folding.vim
  7. +9 −90 vim/vimrc
View
51 bin/lein
@@ -1,17 +1,17 @@
#!/usr/bin/env bash
-# Ensure this file is executable via chmod a+x lein, then place it
+# Ensure this file is executable via `chmod a+x lein`, then place it
# somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
# installed upon first run into the ~/.lein/self-installs directory.
-export LEIN_VERSION="2.0.0"
+export LEIN_VERSION="2.1.2"
case $LEIN_VERSION in
*SNAPSHOT) SNAPSHOT="YES" ;;
*) SNAPSHOT="NO" ;;
esac
-if [[ "$OSTYPE" == "cygwin" ]]; then
+if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
delimiter=";"
else
delimiter=":"
@@ -21,6 +21,8 @@ function make_native_path {
# ensure we have native paths
if [[ "$OSTYPE" == "cygwin" && "$1" == /* ]]; then
echo -n "$(cygpath -wp "$1")"
+ elif [[ "$OSTYPE" == "msys" && "$1" == /* ]]; then
+ echo -n "$(sh -c "(cd $1 2</dev/null && pwd -W) || echo $1 | sed 's/^\\/\([a-z]\)/\\1:/g'")"
else
echo -n "$1"
fi
@@ -89,18 +91,21 @@ done
BIN_DIR="$(dirname "$SCRIPT")"
-# Try to make the default more sane for :eval-in :classloader.lein
-grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null &&
-LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx512m"}"
+export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
+
+# When :eval-in :classloader we need more memory
+grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
+ export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Xms64m -Xmx512m"
if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
# Running from source checkout
LEIN_DIR="$(dirname "$BIN_DIR")"
- # Need to use lein 1.x to bootstrap the leiningen-core library (for aether)
- if [ "$(ls "$LEIN_DIR"/leiningen-core/lib/*)" = "" ]; then
+ # Need to use lein release to bootstrap the leiningen-core library (for aether)
+ if [ ! -r "$LEIN_DIR/leiningen-core/.lein-bootstrap" ]; then
echo "Leiningen is missing its dependencies."
- echo "Please see \"Building\" in CONTRIBUTING.md."
+ echo "Please run \"lein bootstrap\" in the leiningen-core/ directory"
+ echo "with a stable release of Leiningen. See CONTRIBUTING.md for details."
exit 1
fi
@@ -113,8 +118,7 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
fi
fi
- # Use bin/lein to calculate its own classpath since src/ and
- # leiningen-core/lib/*jar suffices to run the classpath task.
+ # Use bin/lein to calculate its own classpath.
if [ ! -r "$LEIN_DIR/.lein-classpath" ] && [ "$1" != "classpath" ]; then
echo "Recalculating Leiningen's classpath."
ORIG_PWD="$PWD"
@@ -127,14 +131,14 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
fi
mkdir -p "$LEIN_DIR/target/classes"
- export LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx256m"} -Dclojure.compile.path=$LEIN_DIR/target/classes"
+ export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Dclojure.compile.path=$LEIN_DIR/target/classes"
add_path CLASSPATH "$LEIN_DIR/leiningen-core/src/" "$LEIN_DIR/leiningen-core/resources/" \
- "$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
+ "$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
if [ -r "$LEIN_DIR/.lein-classpath" ]; then
add_path CLASSPATH "$(cat "$LEIN_DIR/.lein-classpath" 2> /dev/null)"
else
- add_path CLASSPATH "$LEIN_DIR/leiningen-core/lib/*"
+ add_path CLASSPATH "$(cat "$LEIN_DIR/leiningen-core/.lein-bootstrap" 2> /dev/null)"
fi
else # Not running from a checkout
add_path CLASSPATH "$LEIN_JAR"
@@ -165,6 +169,8 @@ function download_failed_message {
echo "to turn off certificate checks:"
echo " export HTTP_CLIENT=\"wget --no-check-certificate -O\" # or"
echo " export HTTP_CLIENT=\"curl --insecure -f -L -o\""
+ echo "It's also possible that you're behind a firewall haven't yet"
+ echo "set HTTP_PROXY and HTTPS_PROXY."
}
# TODO: explain what to do when Java is missing
@@ -182,7 +188,11 @@ export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
# If you're packaging this for a package manager (.deb, homebrew, etc)
# you need to remove the self-install and upgrade functionality or see lein-pkg.
if [ "$1" = "self-install" ]; then
- if [ -r "$LEIN_JAR" ]; then
+ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+ echo "Running self-install from a checkout is not supported."
+ echo "See CONTRIBUTING.md for SNAPSHOT-specific build instructions."
+ exit 1
+ elif [ -r "$LEIN_JAR" ]; then
echo "The self-install jar already exists at $LEIN_JAR."
echo "If you wish to re-download, delete it and rerun \"$0 self-install\"."
exit 1
@@ -197,9 +207,6 @@ if [ "$1" = "self-install" ]; then
else
rm "$LEIN_JAR.pending" 2> /dev/null
download_failed_message "$LEIN_URL"
- if [ $SNAPSHOT = "YES" ]; then
- echo "See README.md for SNAPSHOT-specific build instructions."
- fi
exit 1
fi
elif [ "$1" = "upgrade" ]; then
@@ -216,8 +223,7 @@ elif [ "$1" = "upgrade" ]; then
echo "You do not have permission to upgrade the installation in $SCRIPT"
exit 1
else
- # TODO: change to stable when 2.0.0 is released
- TARGET_VERSION="${2:-preview}"
+ TARGET_VERSION="${2:-stable}"
echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
echo -n "Do you want to continue [Y/n]? "
read RESP
@@ -262,7 +268,7 @@ else
if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) &&
[ -r project.clj ]; then
- INPUTS="$@ $(cat project.clj) $(cat "$LEIN_HOME/profiles.clj")"
+ INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(cat "$LEIN_HOME/profiles.clj")"
INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ")
# Just don't change :target-path in project.clj, mkay?
TRAMPOLINE_FILE="target/trampolines/$INPUT_CHECKSUM"
@@ -282,8 +288,7 @@ else
exec sh -c "exec $(cat $TRAMPOLINE_FILE)"
else
export TRAMPOLINE_FILE
- "$LEIN_JAVA_CMD" \
- -client -XX:+TieredCompilation \
+ "$LEIN_JAVA_CMD" -client \
"${BOOTCLASSPATH[@]}" \
$LEIN_JVM_OPTS \
-Dfile.encoding=UTF-8 \
View
48 vim/after/plugin/fireplace.vim
@@ -0,0 +1,48 @@
+" Rebind keys in this file in the middle of nowhere because Tim Pope doesn't
+" like letting me do it in my vimrc like every other plugin in the world.
+
+" K is for "Kill", M is for "Man"
+autocmd FileType clojure nunmap <buffer> K
+autocmd FileType clojure nmap <buffer> M <Plug>FireplaceK
+
+" Soft and hard require can take "r" in localleaderland
+autocmd FileType clojure nunmap <buffer> cpr
+autocmd FileType clojure nmap <buffer> <localleader>r :Require<cr>
+autocmd FileType clojure nmap <buffer> <localleader>R :Require!<cr>
+
+" Okay enough with the goddamn eval mappings
+autocmd FileType clojure nunmap <buffer> cp
+autocmd FileType clojure nunmap <buffer> cpp
+autocmd FileType clojure nunmap <buffer> cq
+autocmd FileType clojure nunmap <buffer> cqq
+autocmd FileType clojure nunmap <buffer> cqp
+autocmd FileType clojure nunmap <buffer> cqc
+autocmd FileType clojure nunmap <buffer> c!
+autocmd FileType clojure nunmap <buffer> c!!
+
+" Eval form
+autocmd FileType clojure nmap <buffer> <localleader>ef <Plug>FireplacePrintab
+
+" Eval top-level form
+autocmd FileType clojure nmap <buffer> <localleader>ee mz:call PareditFindDefunBck()<cr><Plug>FireplacePrintab:normal! `z<cr>
+
+" QuasiREPL
+autocmd FileType clojure execute 'nmap <buffer> <localleader>q <Plug>FireplacePrompt' . &cedit . 'i'
+
+" Again!
+autocmd FileType clojure execute 'nmap <buffer> <localleader>a <Plug>FireplacePrompt' . &cedit . 'k<cr>'
+
+" Edit form in quasirepl
+autocmd FileType clojure nmap <buffer> <localleader>Ef <Plug>FireplaceEditab
+
+" Kill all the movement mappings except gf (I like that one)
+autocmd FileType clojure nunmap <buffer> [<c-d>
+autocmd FileType clojure nunmap <buffer> ]<c-d>
+autocmd FileType clojure nunmap <buffer> <c-w><c-d>
+autocmd FileType clojure nunmap <buffer> <c-w>d
+autocmd FileType clojure nunmap <buffer> <c-w>gd
+
+" Use normal tag movement keys instead, ctags is fucked for Clojure anyway
+autocmd FileType clojure nmap <buffer> <c-]> <Plug>FireplaceDjump
+autocmd FileType clojure nmap <buffer> <c-\> :vsplit<cr><Plug>FireplaceDjump
+
1 vim/bundle/fireplace
@@ -0,0 +1 @@
+Subproject commit 4f6b8e52376dc9973ca0478b750578b681681b55
1 vim/bundle/rainbow-parens
@@ -0,0 +1 @@
+Subproject commit eb8baa5428bde10ecc1cb14eed1d6e16f5f24695
1 vim/bundle/vim-clojure-static
@@ -0,0 +1 @@
+Subproject commit 949adf73ae1a82c48cd951677c055bd38a30af99
View
128 vim/ftplugin/clojure/folding.vim
@@ -0,0 +1,128 @@
+if exists('loaded_clojurefolding') || &cp
+ finish
+endif
+let loaded_clojurefolding=1
+
+let folded_forms = [
+ \ 'def',
+ \ 'defn',
+ \ 'defn-',
+ \ 'defform',
+ \ 'defform-',
+ \ 'defrule',
+ \ 'defprotocol',
+ \ 'defparser',
+ \ 'defmacro',
+ \ 'defmethod',
+ \ 'defmulti',
+ \ 'defonce',
+ \ 'defpage',
+ \ 'defmigration',
+ \ 'defsketch',
+ \ 'defspec',
+ \ 'defremote',
+ \ 'defrecord',
+ \ 'defrec',
+ \ 'defpartial',
+ \ 'extend-type',
+ \ 'extend-protocol',
+ \ 'defgauge',
+ \ 'defmeter',
+ \ 'defhistogram',
+ \ 'defcounter',
+ \ 'deftimer',
+ \ 'deftest',
+ \ 'defroutes',
+ \ 'defentity',
+ \ 'defaspect',
+ \ 'add-aspect',
+ \ 'defdb',
+ \ 'defproject',
+ \ 'defsynth',
+ \ 'definst',
+ \ 'ns'
+ \ ]
+let s:form_re = '\v^\((' . join(folded_forms, '|') . ')\s'
+let s:form_re_bare = '\v^\((' . join(folded_forms, '|') . ')$'
+
+function! s:NextNonBlankLineContents(start)
+ let lnum = a:start
+ let max = line("$")
+
+ while 1
+ let lnum += 1
+
+ " If we've run off the end of the file, return a blank string as
+ " a sentinel.
+ if lnum > max
+ return ""
+ endif
+
+ " Otherwise, get the contents.
+ let contents = getline(lnum)
+
+ " If they're non-blank, return it. Otherwise we'll loop to the next
+ " line.
+ if contents =~ '\v\S'
+ return contents
+ endif
+ endwhile
+endfunction
+
+function! GetClojureFold()
+ let line = getline(v:lnum)
+
+ if line =~ s:form_re || line =~ s:form_re_bare
+ " We're on one of the forms we want to fold.
+
+ let nextline = s:NextNonBlankLineContents(v:lnum)
+
+ " If we've run off the end of the file, this means we're on a top-level
+ " form with no later nonblank lines in the file. This has to be a one
+ " liner, because there's no content left that could be closing parens!
+ if nextline == ""
+ return 0
+ elseif nextline =~ '\v^\s+'
+ " If it's indented, this almost certainly isn't a one-liner. Fold
+ " away!
+ return ">1"
+ else
+ " Otherwise, the next non-blank line after this one is not
+ " indented. This means we're on a one-liner, so we don't want to
+ " fold.
+ return 0
+ endif
+ elseif line =~ '^\s*$'
+ " We need to look at the next non-blank line to determine how to fold
+ " blank lines.
+ let nextline = s:NextNonBlankLineContents(v:lnum)
+
+ " If we've run off the end of the file, this means we're on one of
+ " a series of blank lines ending the file. They shouldn't be folded
+ " with anything.
+ if nextline == ""
+ return 0
+ elseif nextline =~ '\v^\s+'
+ " If it's indented, we're in the middle of an existing form.
+ " Just fold with that.
+ return "="
+ else
+ " Otherwise, the next non-blank line after this one is not
+ " indented. That means we need to close any existing folds
+ " here.
+ return "<1"
+ endif
+ elseif line =~ '\v^\s+\S'
+ " Indented content, fold it into any existing folds.
+ return "="
+ else
+ " We are sitting on a non-blank, non-indented line, but it's not one of
+ " our special top-level forms, so we'll just leave it alone.
+ return 0
+ endif
+endfunction
+
+function! TurnOnClojureFolding()
+ setlocal foldexpr=GetClojureFold()
+ setlocal foldmethod=expr
+endfunction
View
99 vim/vimrc
@@ -611,45 +611,12 @@ augroup END
" }}}
" Clojure {{{
-" function! SlimvToggleRepl()
-" if bufname('%') ==# 'SLIMV.REPL'
-" let origin = b:pop_back_to
-" q
-" execute "" . origin . "wincmd w"
-" else
-" let origin = winnr()
-" vertical botright split
-" e SLIMV.REPL
-" let b:pop_back_to = origin
-" endif
-" endfunction
-
-function! s:DebullshitClojureStacktrace() " {{{
- syntax match GarbageFrame '\v +.+\.(java|clj):\d+ (clojure|swank)\..+$'
- hi link GarbageFrame Comment
-endfunction " }}}
-
-command! -nargs=0 DebullshitClojureStacktrace call s:DebullshitClojureStacktrace()
-
augroup ft_clojure
au!
- au FileType SLDB DebullshitClojureStacktrace
-
au BufNewFile,BufRead riemann.config set filetype=clojure
- au FileType clojure silent! call TurnOnClojureFolding()
- au FileType clojure compiler clojure
- au FileType clojure setlocal report=100000
-
- au BufWinEnter SLIMV.REPL setlocal nolist
- au BufNewFile,BufReadPost SLIMV.REPL setlocal nowrap foldlevel=99
- au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> A GA
- au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> <localleader>R :emenu REPL.<Tab>
- " Fix the eval mappings.
- au FileType clojure nnoremap <buffer> <localleader>ef :call SlimvEvalExp()<cr>
- au FileType clojure nnoremap <buffer> <localleader>ee :call SlimvEvalDefun()<cr>
- au FileType clojure nnoremap <buffer> <localleader>en mzgg:call SlimvEvalDefun()<cr>`z
+ au FileType clojure silent! call TurnOnClojureFolding()
" Friendlier Paredit mappings.
au FileType clojure noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr>
@@ -660,15 +627,10 @@ augroup ft_clojure
au FileType clojure noremap <buffer> (s :<c-u>call PareditSplit()<cr>
au FileType clojure noremap <buffer> [ :<c-u>call PareditSmartJumpOpening(0)<cr>
au FileType clojure noremap <buffer> ] :<c-u>call PareditSmartJumpClosing(0)<cr>
-
- " And the inspect mapping.
- au FileType clojure nmap <buffer> \i \di
-
- " And REPL-toggling mapping.
- " au FileType clojure nnoremap <buffer> \rr :call SlimvToggleRepl()<cr>
+ " ))))))))
" Indent top-level form.
- au FileType clojure nmap <buffer> <localleader>= mz99[(v%='z
+ au FileType clojure nmap <buffer> <localleader>= mz:call PareditFindDefunBck()<cr>=ab'z
augroup END
" }}}
@@ -861,26 +823,6 @@ augroup ft_lilypond
augroup END
" }}}
-" Lisp {{{
-
-augroup ft_lisp
- au!
- au FileType lisp call TurnOnLispFolding()
- " au FileType lisp nnoremap <buffer> <localleader>ee mz99[(va("ry:call Send_to_Tmux(@r)<cr>
- " au FileType lisp nnoremap <buffer> <localleader>ee mz99[(:call SlimvEvalExp()<cr>`z
-
- " Fix the eval mappings.
- au FileType lisp nnoremap <buffer> <localleader>ef :call SlimvEvalExp()<cr>
- au FileType lisp nnoremap <buffer> <localleader>ee :call SlimvEvalDefun()<cr>
-
- au FileType lisp nnoremap <buffer> <localleader>tt mz0l99[(vab"ry:call Send_to_Tmux(@r)<cr>`z
- au FileType lisp nnoremap <buffer> <localleader>tb mzggVG"ry:call Send_to_Tmux(@r)<cr>`z
-
- " Indent top-level form.
- au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z
-augroup END
-
-" }}}
" Mail {{{
augroup ft_mail
@@ -1184,11 +1126,6 @@ vnoremap <leader>l :Linediff<cr>
nnoremap <leader>L :LinediffReset<cr>
" }}}
-" Lisp (built-in) {{{
-
-let g:lisp_rainbow = 1
-
-" }}}
" Makegreen {{{
nnoremap \| :call MakeGreen('')<cr>
@@ -1228,6 +1165,12 @@ let g:org_todo_keywords = ['TODO', '|', 'DONE']
let g:org_debug = 1
" }}}
+" Paredit {{{
+
+let g:paredit_smartjump = 1
+let g:paredit_shortmaps = 0
+
+" }}}
" Powerline {{{
let g:Powerline_symbols = 'fancy'
@@ -1292,23 +1235,6 @@ endfunction
nnoremap <silent> <leader><tab> :ScratchToggle<cr>
" }}}
-" SLIMV {{{
-
-let g:slimv_leader = '\'
-let g:slimv_keybindings = 2
-let g:slimv_repl_name = 'SLIMV.REPL'
-let g:slimv_repl_split = 4
-" let g:slimv_repl_syntax = 0
-let g:slimv_repl_wrap = 0
-let g:slimv_preferred = 'clisp'
-let g:paredit_smartjump = 1
-
-" Use a swank command that works, and doesn't require new app windows.
-let g:slimv_swank_clojure = '!dtach -n /tmp/dtach-swank.sock -r winch lein ritz 4005'
-" let g:slimv_swank_clojure = '! xterm -e lein ritz 4005 &'
-let g:slimv_swank_clojure = '!false'
-
-" }}}}
" Sparkup {{{
let g:sparkupNextMapping = '<c-s>'
@@ -1362,13 +1288,6 @@ let g:tslime_visual_mapping = '<localleader>t'
let g:tslime_vars_mapping = '<localleader>T'
" }}}
-" VimClojure {{{
-
-let vimclojure#HighlightBuiltins = 1
-let vimclojure#ParenRainbow = 1
-let vimclojure#WantNailgun = 0
-
-" }}}
" YankRing {{{
function! YRRunAfterMaps()

0 comments on commit 887183d

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