Skip to content

Commit 02ae11b

Browse files
committed
Parens placed immediately after symbols won't break syntax
1 parent b4c6f52 commit 02ae11b

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

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

+15-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,14 @@
166166
":a:" (partial = [emptyKeyword :clojureSymbol emptyKeyword])
167167
":a/" (partial = [:clojureKeywordNsColon :clojureKeywordNs :clojureKeywordNsSeparator])
168168
":/" (partial = [:clojureKeywordNsColon :clojureKeywordNsSeparator])
169-
":" (partial = [emptyKeyword])]])
169+
":" (partial = [emptyKeyword])
170+
"a[:b/c]" (partial = [:clojureSymbol
171+
:clojureParen
172+
:clojureKeywordNsColon
173+
:clojureKeywordNs
174+
:clojureKeywordNsSeparator
175+
:clojureKeyword
176+
:clojureParen])]])
170177

171178
(defsyntaxtest symbols-test
172179
["%s"
@@ -194,7 +201,13 @@
194201
"a/" !sym
195202
"a/" !symWithNs
196203
"/" !sym
197-
"#function[test/hello]" dispatchWithSymbolInside]])
204+
"#function[test/hello]" dispatchWithSymbolInside
205+
"a[b/c]" (partial = [:clojureSymbol
206+
:clojureParen
207+
:clojureSymbolNs
208+
:clojureSymbolNsSeparator
209+
:clojureSymbol
210+
:clojureParen])]])
198211

199212
(comment (test #'keywords-test))
200213

Diff for: 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)