Add b:clojure_syntax_without_core_keywords

guns · guns · commit 82e2156ffbe7 · 2014-04-03T21:40:18.000-05:00
Some namespaces exclude vars from clojure.core; examples of this are
namespaces that use core.logic or piplin.

This variable allows a plugin to have complete control over all keyword
matches in the buffer.
diff --git a/README.markdown b/README.markdown
@@ -116,8 +116,12 @@ to have a certain set of symbols highlighted in a certain way, while the
 buffer-local version is intended for plugin authors who wish to highlight
 symbols dynamically.
 
+If the buffer flag `b:clojure_syntax_without_core_keywords` is set, vars from
+`clojure.core` are not highlighted by default. This is useful for highlighting
+namespaces that have set `(:refer-clojure :only [])`.
+
 [`vim-clojure-highlight`](https://github.com/guns/vim-clojure-highlight) uses
-this feature to highlight extra vars when connected to a REPL.
+these variables to highlight extra vars when connected to a REPL.
 
 Indent Options
 ==============
diff --git a/doc/clojure.txt b/doc/clojure.txt
@@ -138,6 +138,9 @@ identifiers:
 <
 Refer to the Clojure syntax script for valid syntax group names.
 
+If the |buffer-variable| *b:clojure_syntax_without_core_keywords* is set, only
+language constants and special forms are matched.
+
 Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
 Any list, vector, or map that extends over more than one line can be folded
 using the standard Vim |fold-commands|.
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -41,7 +41,14 @@ function! s:syntax_keyword(dict)
 	endfor
 endfunction
 
-call s:syntax_keyword(s:clojure_syntax_keywords)
+if exists('b:clojure_syntax_without_core_keywords') && b:clojure_syntax_without_core_keywords
+	" Only match language specials and primitives
+	for s:key in ['clojureBoolean', 'clojureConstant', 'clojureException', 'clojureSpecial']
+		execute 'syntax keyword' s:key join(s:clojure_syntax_keywords[s:key], ' ')
+	endfor
+else
+	call s:syntax_keyword(s:clojure_syntax_keywords)
+endif
 
 if exists('g:clojure_syntax_keywords')
 	call s:syntax_keyword(g:clojure_syntax_keywords)
@@ -51,6 +58,7 @@ if exists('b:clojure_syntax_keywords')
 	call s:syntax_keyword(b:clojure_syntax_keywords)
 endif
 
+unlet! s:key
 delfunction s:syntax_keyword
 
 " Keywords are symbols:

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ identifiers:`
`138`	`138`	`<`
`139`	`139`	`Refer to the Clojure syntax script for valid syntax group names.`
`140`	`140`
	`141`	`+If the \|buffer-variable\| b:clojure_syntax_without_core_keywords is set, only`
	`142`	`+language constants and special forms are matched.`
	`143`	`+`
`141`	`144`	`Setting g:clojure_fold enables folding Clojure code via the syntax engine.`
`142`	`145`	`Any list, vector, or map that extends over more than one line can be folded`
`143`	`146`	`using the standard Vim \|fold-commands\|.`