Skip to content

Commit c513534

Browse files
committed
Fix keyword ns regex to correctly match :a[:b/c]
1 parent 02ae11b commit c513534

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

Diff for: clj/test/vim/syntax_test.clj

+16-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,15 @@
173173
:clojureKeywordNs
174174
:clojureKeywordNsSeparator
175175
:clojureKeyword
176-
:clojureParen])]])
176+
:clojureParen])
177+
":a[:b/c]" (partial = [:clojureKeywordNsColon
178+
:clojureKeyword
179+
:clojureParen
180+
:clojureKeywordNsColon
181+
:clojureKeywordNs
182+
:clojureKeywordNsSeparator
183+
:clojureKeyword
184+
:clojureParen])]])
177185

178186
(defsyntaxtest symbols-test
179187
["%s"
@@ -207,7 +215,13 @@
207215
:clojureSymbolNs
208216
:clojureSymbolNsSeparator
209217
:clojureSymbol
210-
:clojureParen])]])
218+
:clojureParen])
219+
"#'a/b" (partial = [:clojureDispatch
220+
:clojureDispatch
221+
:clojureSymbolNs
222+
:clojureSymbolNsSeparator
223+
:clojureSymbol
224+
:clojureParen])]])
211225

212226
(comment (test #'keywords-test))
213227

Diff for: syntax/clojure.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ endif
6262
unlet! s:key
6363
delfunction s:syntax_keyword
6464

65-
syntax match clojureKeywordNs contained "\v[^/: ']+[^/ ']*\ze/"
65+
syntax match clojureKeywordNs contained "\v[^ \n\r\t()\[\]{}";@^`~\\\/'#]+\ze\/"
6666
syntax match clojureKeywordNsSeparator contained "/"
6767
syntax match clojureKeywordNsColon contained "\v<:{1,2}"
6868
" Keywords are symbols:

0 commit comments

Comments
 (0)