Skip to content

Commit b4c6f52

Browse files
committed
Dispatch with symbol won't break parens
1 parent 11c5478 commit b4c6f52

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

clj/test/vim/syntax_test.clj

+23-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,27 @@
2929
:clojureKeyword])
3030
(def-eq-predicates kwWithNamedNs [:clojureKeywordNsColon :clojureKeywordNsColon
3131
:clojureKeywordNs :clojureKeywordNsSeparator :clojureKeyword])
32-
32+
(def-eq-predicates dispatchWithSymbolInside [:clojureDispatch
33+
:clojureSymbol
34+
:clojureSymbol
35+
:clojureSymbol
36+
:clojureSymbol
37+
:clojureSymbol
38+
:clojureSymbol
39+
:clojureSymbol
40+
:clojureSymbol
41+
:clojureParen
42+
:clojureSymbolNs
43+
:clojureSymbolNs
44+
:clojureSymbolNs
45+
:clojureSymbolNs
46+
:clojureSymbolNsSeparator
47+
:clojureSymbol
48+
:clojureSymbol
49+
:clojureSymbol
50+
:clojureSymbol
51+
:clojureSymbol
52+
:clojureParen])
3353
(defpredicates character :clojureCharacter)
3454
(defpredicates regexp :clojureRegexp)
3555
(defpredicates regexp-delimiter :clojureRegexpDelimiter)
@@ -173,7 +193,8 @@
173193
"a:" !symWithNs
174194
"a/" !sym
175195
"a/" !symWithNs
176-
"/" !sym]])
196+
"/" !sym
197+
"#function[test/hello]" dispatchWithSymbolInside]])
177198

178199
(comment (test #'keywords-test))
179200

syntax/clojure.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ syntax region clojureString matchgroup=clojureStringDelimiter start=/"/ skip=/\\
7979

8080
syntax match clojureCharacter "\v\\%(o%([0-3]\o{2}|\o{1,2})|u\x{4}|newline|tab|space|return|backspace|formfeed|.)"
8181

82-
syntax match clojureSymbolNs contained "\v[^/ ]+\ze/"
82+
syntax match clojureSymbolNs contained "\v[^/\[ ]+\ze/"
8383
syntax match clojureSymbolNsSeparator contained "/"
8484
syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@1<!" contains=clojureSymbolNs,clojureSymbolNsSeparator
8585

0 commit comments

Comments
 (0)