Merge dictionaries into ftplugin/clojure.dict

guns · guns · commit 3cea4e8231ce · 2013-01-30T13:41:32.000-06:00
The only other .dict in Vim runtime is runtime/ftplugin/logtalk.dict, so
we follow suit.
diff --git a/ftplugin/clojure.dict b/ftplugin/clojure.dict
@@ -45,6 +45,7 @@
 ->VecSeq
 -cache-protocol-fn
 -reset-methods
+.
 ..
 /
 <
@@ -122,6 +123,7 @@ byte-array
 bytes
 case
 cast
+catch
 char
 char-array
 char-escape-string
@@ -169,6 +171,7 @@ dec
 dec'
 decimal?
 declare
+def
 default-data-readers
 definline
 definterface
@@ -196,6 +199,7 @@ dissoc
 dissoc!
 distinct
 distinct?
+do
 doall
 dorun
 doseq
@@ -230,6 +234,7 @@ ffirst
 file-seq
 filter
 filterv
+finally
 find
 find-keyword
 find-ns
@@ -244,6 +249,7 @@ float?
 floats
 flush
 fn
+fn
 fn?
 fnext
 fnil
@@ -273,6 +279,7 @@ hash-map
 hash-set
 identical?
 identity
+if
 if-let
 if-not
 ifn?
@@ -306,6 +313,7 @@ last
 lazy-cat
 lazy-seq
 let
+let
 letfn
 line-seq
 list
@@ -321,6 +329,7 @@ long
 long-array
 longs
 loop
+loop
 macroexpand
 macroexpand-1
 make-array
@@ -342,11 +351,14 @@ methods
 min
 min-key
 mod
+monitor-enter
+monitor-exit
 munge
 name
 namespace
 namespace-munge
 neg?
+new
 newline
 next
 nfirst
@@ -415,6 +427,7 @@ proxy-super
 push-thread-bindings
 pvalues
 quot
+quote
 rand
 rand-int
 rand-nth
@@ -432,6 +445,7 @@ read
 read-line
 read-string
 realized?
+recur
 reduce
 reduce-kv
 reduced
@@ -479,6 +493,7 @@ seque
 sequence
 sequential?
 set
+set!
 set-agent-send-executor!
 set-agent-send-off-executor!
 set-error-handler!
@@ -525,13 +540,15 @@ take-while
 test
 the-ns
 thread-bound?
+throw
 time
 to-array
 to-array-2d
 trampoline
 transient
 tree-seq
 true?
+try
 type
 unchecked-add
 unchecked-add-int
@@ -562,6 +579,7 @@ update-proxy
 use
 val
 vals
+var
 var-get
 var-set
 var?
diff --git a/ftplugin/clojure/special-forms.dict b/ftplugin/clojure/special-forms.dict
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -21,7 +21,7 @@ setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$
 syntax match clojureError "]\|}\|)"
 
 " Generated from vim_clojure_static.clj
-" Clojure 1.5.0-RC3
+" Clojure 1.5.0-RC4
 syntax keyword clojureConstant nil
 syntax keyword clojureBoolean false true
 syntax keyword clojureSpecial . catch clojure.core/fn clojure.core/let clojure.core/loop def do finally fn if let loop monitor-enter monitor-exit new quote recur set! throw try var
diff --git a/vim_clojure_static.clj b/vim_clojure_static.clj
@@ -53,22 +53,16 @@
          (clojure.string/join \newline definitions))))
 
 (def core-dictionary
-  "Newline delimited string of public vars in clojure.core. Intended for use
-   as a dictionary file for Vim insert mode completion."
+  "Newline delimited string of special forms and public vars in clojure.core.
+   Intended for use as a dictionary file for Vim insert mode completion."
   (->> `clojure.core
        ns-publics
        keys
-       (map str)
-       sort
-       (clojure.string/join \newline)))
-
-(def special-forms-dictionary
-  (->> special-forms
+       (concat special-forms)
        (map str)
        sort
        (clojure.string/join \newline)))
 
 (comment
   (do (spit "/tmp/clojure-keywords.vim" syntax-keywords)
-      (spit "/home/guns/src/vim-clojure-static/ftplugin/clojure/clojure.core.dict" core-dictionary)
-      (spit "/home/guns/src/vim-clojure-static/ftplugin/clojure/special-forms.dict" special-forms-dictionary)))
+      (spit "/home/guns/src/vim-clojure-static/ftplugin/clojure.dict" core-dictionary)))
