Skip to content

Commit ff999aa

Browse files
gunsguns
committed
Re-add dictionary completions for core functions
Meikel's ftplugin included dictionary completions for many functions in clojure jar file. Given the superior functionality of a REPL connected omnifunc completion function, and the fact that the keyword list tended to go out of sync, I originally removed this feature when extracting vim-clojure-static. However, after a few weeks of use I can see that having at least the core functions (a default Clojure namespace refers clojure.core) in the completion list is very useful for the following reasons: * Very discoverable. Completions appear in the default Ctrl-N/Ctrl-P completion menu. The Ctrl-X_Ctrl-O command is not nearly as well known in contrast * Helpful to Clojure neophytes. Completing a var name assures you that you have spelled it correctly, and the insert completion list becomes a place to discover new functions. * Enables completion even when not connected to a REPL We do not include _all_ the public vars in the clojure jar because the recommended way to use functions from other namespaces is to call them by their fully qualified name (usually shortened by an alias) instead of importing them directly into your namespace using 'use or 'refer. This conflicts with a flat list of symbols across different namespaces, so we include just clojure.core and the special forms.
1 parent c95c328 commit ff999aa

File tree

3 files changed

+628
-12
lines changed

3 files changed

+628
-12
lines changed

‎ftplugin/clojure.vim‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
if exists("b:did_ftplugin")
1111
finish
1212
endif
13-
1413
let b:did_ftplugin = 1
1514

1615
let s:cpo_save = &cpo
1716
set cpo&vim
1817

19-
let b:undo_ftplugin = 'setlocal define< formatoptions< comments< commentstring<'
18+
let b:undo_ftplugin = 'setlocal define< formatoptions< comments< commentstring< complete<'
2019

2120
" There will be false positives, but this is arguably better than missing the
2221
" whole set of user-defined def* definitions.
@@ -30,21 +29,27 @@ setlocal formatoptions-=t formatoptions+=croql
3029
setlocal comments=sO:;\ -,mO:;\ \ ,n:;
3130
setlocal commentstring=;%s
3231

32+
function! s:escape_path_for_option(path)
33+
let path = fnameescape(a:path)
34+
" Whitespace escaping for Windows
35+
let path = substitute(path, '\', '\\\\', 'g')
36+
let path = substitute(path, '\ ', '\\ ', 'g')
37+
return path
38+
endfunction
39+
40+
" Provide insert mode completions for special forms and public vars in
41+
" clojure.core
42+
for s:compfile in split(globpath(&rtp, "ftplugin/clojure/*.txt"), '\n')
43+
execute 'setlocal complete+=k' . s:escape_path_for_option(s:compfile)
44+
endfor
45+
3346
" Take all directories of the CLOJURE_SOURCE_DIRS environment variable
3447
" and add them to the path option.
3548
"
3649
" This is a legacy option for VimClojure users.
37-
if has("win32") || has("win64")
38-
let s:delim = ";"
39-
else
40-
let s:delim = ":"
41-
endif
50+
let s:delim = (has("win32") || has("win64")) ? ';' : ':'
4251
for s:dir in split($CLOJURE_SOURCE_DIRS, s:delim)
43-
let s:path = fnameescape(s:dir . "/**")
44-
" Whitespace escaping for Windows
45-
let s:path = substitute(s:path, '\', '\\\\', 'g')
46-
let s:path = substitute(s:path, '\ ', '\\ ', 'g')
47-
execute "setlocal path+=" . s:path
52+
execute "setlocal path+=" . s:escape_path_for_option(s:dir . "/**")
4853
endfor
4954
if exists('$CLOJURE_SOURCE_DIRS')
5055
let b:undo_ftplugin .= '| setlocal path<'
@@ -63,6 +68,8 @@ if has("gui_win32") && !exists("b:browsefilter")
6368
\ "All Files (*.*)\t*.*\n"
6469
endif
6570

71+
delfunction s:escape_path_for_option
72+
6673
let &cpo = s:cpo_save
6774

6875
" vim:sts=4 sw=4 et:

0 commit comments

Comments
 (0)