Fix generate/vim-top-cluster

guns · guns · commit c012e5ac6110 · 2014-04-02T02:53:33.000-05:00
diff --git a/clj/src/vim_clojure_static/generate.clj b/clj/src/vim_clojure_static/generate.clj
@@ -68,13 +68,13 @@
     [] coll))
 
 (defn vim-top-cluster
-  "Generate a Vimscript literal `syntax cluster` statement for all top-level
-   syntax groups in the given syntax buffer."
-  [syntax-buf]
+  "Generate a Vimscript literal `syntax cluster` statement for `groups` and
+   all top-level syntax groups in the given syntax buffer."
+  [groups syntax-buf]
   (->> syntax-buf
        (re-seq #"syntax\s+(?:keyword|match|region)\s+(\S+)(?!.*\bcontained\b)")
        (map peek)
-       (concat (map first keyword-groups))
+       (concat groups)
        sort
        distinct
        (string/join \,)
diff --git a/clj/src/vim_clojure_static/update.clj b/clj/src/vim_clojure_static/update.clj
@@ -55,7 +55,8 @@
           g/vim-unicode-block-char-classes)
     "-*- TOP CLUSTER -*-"
     (qstr g/generation-comment
-          (g/vim-top-cluster (slurp (fjoin dir "syntax/clojure.vim"))))}
+          (g/vim-top-cluster (mapv first g/keyword-groups)
+                             (slurp (fjoin dir "syntax/clojure.vim"))))}
 
    (fjoin dir "ftplugin/clojure.vim")
    {"-*- LISPWORDS -*-"
