Skip to content

Commit 0785d68

Browse files
gunsguns
committed
Remove rainbow paren support.
Better Rainbow Parentheses by kien: https://github.com/kien/rainbow_parentheses.vim Less code, less coupling, more awesome.
1 parent 6e8f2ec commit 0785d68

1 file changed

Lines changed: 7 additions & 86 deletions

File tree

‎syntax/clojure.vim‎

Lines changed: 7 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,11 @@ syn match clojureDispatch "\^"
6969
syn match clojureAnonArg contained "%\(\d\|&\)\?"
7070
syn match clojureVarArg contained "&"
7171

72-
syn region clojureSexpLevel0 matchgroup=clojureParen0 start="(" matchgroup=clojureParen0 end=")" contains=@clojureTopCluster,clojureSexpLevel1
73-
syn region clojureSexpLevel1 matchgroup=clojureParen1 start="(" matchgroup=clojureParen1 end=")" contained contains=@clojureTopCluster,clojureSexpLevel2
74-
syn region clojureSexpLevel2 matchgroup=clojureParen2 start="(" matchgroup=clojureParen2 end=")" contained contains=@clojureTopCluster,clojureSexpLevel3
75-
syn region clojureSexpLevel3 matchgroup=clojureParen3 start="(" matchgroup=clojureParen3 end=")" contained contains=@clojureTopCluster,clojureSexpLevel4
76-
syn region clojureSexpLevel4 matchgroup=clojureParen4 start="(" matchgroup=clojureParen4 end=")" contained contains=@clojureTopCluster,clojureSexpLevel5
77-
syn region clojureSexpLevel5 matchgroup=clojureParen5 start="(" matchgroup=clojureParen5 end=")" contained contains=@clojureTopCluster,clojureSexpLevel6
78-
syn region clojureSexpLevel6 matchgroup=clojureParen6 start="(" matchgroup=clojureParen6 end=")" contained contains=@clojureTopCluster,clojureSexpLevel7
79-
syn region clojureSexpLevel7 matchgroup=clojureParen7 start="(" matchgroup=clojureParen7 end=")" contained contains=@clojureTopCluster,clojureSexpLevel8
80-
syn region clojureSexpLevel8 matchgroup=clojureParen8 start="(" matchgroup=clojureParen8 end=")" contained contains=@clojureTopCluster,clojureSexpLevel9
81-
syn region clojureSexpLevel9 matchgroup=clojureParen9 start="(" matchgroup=clojureParen9 end=")" contained contains=@clojureTopCluster,clojureSexpLevel0
82-
83-
syn region clojureAnonFn matchgroup=clojureParen0 start="#(" matchgroup=clojureParen0 end=")" contains=@clojureTopCluster,clojureAnonArg,clojureSexpLevel0
84-
syn region clojureVector matchgroup=clojureParen0 start="\[" matchgroup=clojureParen0 end="\]" contains=@clojureTopCluster,clojureVarArg,clojureSexpLevel0
85-
syn region clojureMap matchgroup=clojureParen0 start="{" matchgroup=clojureParen0 end="}" contains=@clojureTopCluster,clojureSexpLevel0
86-
syn region clojureSet matchgroup=clojureParen0 start="#{" matchgroup=clojureParen0 end="}" contains=@clojureTopCluster,clojureSexpLevel0
72+
syn region clojureSexp matchgroup=clojureParen start="(" matchgroup=clojureParen end=")" contains=@clojureTopCluster
73+
syn region clojureAnonFn matchgroup=clojureParen start="#(" matchgroup=clojureParen end=")" contains=@clojureTopCluster,clojureAnonArg,clojureSexp
74+
syn region clojureVector matchgroup=clojureParen start="\[" matchgroup=clojureParen end="\]" contains=@clojureTopCluster,clojureVarArg,clojureSexp
75+
syn region clojureMap matchgroup=clojureParen start="{" matchgroup=clojureParen end="}" contains=@clojureTopCluster,clojureSexp
76+
syn region clojureSet matchgroup=clojureParen start="#{" matchgroup=clojureParen end="}" contains=@clojureTopCluster,clojureSexp
8777

8878
syn region clojurePattern start=/L\=\#"/ skip=/\\\\\|\\"/ end=/"/
8979

@@ -93,7 +83,7 @@ syn region clojurePattern start=/L\=\#"/ skip=/\\\\\|\\"/ end=/"/
9383
" See also: https://bitbucket.org/kotarak/vimclojure/issue/87/comment-is-highlighted-incorrectly
9484
"
9585
"syn region clojureCommentSexp start="(" end=")" transparent contained contains=clojureCommentSexp
96-
"syn region clojureComment matchgroup=clojureParen0 start="(comment"rs=s+1 matchgroup=clojureParen0 end=")" contains=clojureTopCluster
86+
"syn region clojureComment matchgroup=clojureParen start="(comment"rs=s+1 matchgroup=clojureParen end=")" contains=clojureTopCluster
9787
syn match clojureComment "comment"
9888
syn region clojureComment start="#!" end="\n"
9989
syn match clojureComment "#_"
@@ -134,76 +124,7 @@ HiLink clojureTodo Todo
134124

135125
HiLink clojureError Error
136126

137-
HiLink clojureParen0 Delimiter
138-
139-
if !exists("g:vimclojure#ParenRainbowColorsDark")
140-
if exists("g:vimclojure#ParenRainbowColors")
141-
let g:vimclojure#ParenRainbowColorsDark =
142-
\ g:vimclojure#ParenRainbowColors
143-
else
144-
let g:vimclojure#ParenRainbowColorsDark = {
145-
\ '1': 'ctermfg=yellow guifg=orange1',
146-
\ '2': 'ctermfg=green guifg=yellow1',
147-
\ '3': 'ctermfg=cyan guifg=greenyellow',
148-
\ '4': 'ctermfg=magenta guifg=green1',
149-
\ '5': 'ctermfg=red guifg=springgreen1',
150-
\ '6': 'ctermfg=yellow guifg=cyan1',
151-
\ '7': 'ctermfg=green guifg=slateblue1',
152-
\ '8': 'ctermfg=cyan guifg=magenta1',
153-
\ '9': 'ctermfg=magenta guifg=purple1'
154-
\ }
155-
endif
156-
endif
157-
158-
if !exists("g:vimclojure#ParenRainbowColorsLight")
159-
if exists("g:vimclojure#ParenRainbowColors")
160-
let g:vimclojure#ParenRainbowColorsLight =
161-
\ g:vimclojure#ParenRainbowColors
162-
else
163-
let g:vimclojure#ParenRainbowColorsLight = {
164-
\ '1': 'ctermfg=darkyellow guifg=orangered3',
165-
\ '2': 'ctermfg=darkgreen guifg=orange2',
166-
\ '3': 'ctermfg=blue guifg=yellow3',
167-
\ '4': 'ctermfg=darkmagenta guifg=olivedrab4',
168-
\ '5': 'ctermfg=red guifg=green4',
169-
\ '6': 'ctermfg=darkyellow guifg=paleturquoise3',
170-
\ '7': 'ctermfg=darkgreen guifg=deepskyblue4',
171-
\ '8': 'ctermfg=blue guifg=darkslateblue',
172-
\ '9': 'ctermfg=darkmagenta guifg=darkviolet'
173-
\ }
174-
endif
175-
endif
176-
177-
function! VimClojureSetupParenRainbow()
178-
if &background == "dark"
179-
let colors = g:vimclojure#ParenRainbowColorsDark
180-
else
181-
let colors = g:vimclojure#ParenRainbowColorsLight
182-
endif
183-
184-
for [level, color] in items(colors)
185-
execute "highlight clojureParen" . level . " " . color
186-
endfor
187-
endfunction
188-
189-
if vimclojure#ParenRainbow != 0
190-
call VimClojureSetupParenRainbow()
191-
192-
augroup VimClojureSyntax
193-
au!
194-
autocmd ColorScheme * if &ft == "clojure" | call VimClojureSetupParenRainbow() | endif
195-
augroup END
196-
else
197-
HiLink clojureParen1 clojureParen0
198-
HiLink clojureParen2 clojureParen0
199-
HiLink clojureParen3 clojureParen0
200-
HiLink clojureParen4 clojureParen0
201-
HiLink clojureParen5 clojureParen0
202-
HiLink clojureParen6 clojureParen0
203-
HiLink clojureParen7 clojureParen0
204-
HiLink clojureParen8 clojureParen0
205-
HiLink clojureParen9 clojureParen0
206-
endif
127+
HiLink clojureParen Delimiter
207128

208129
delcommand HiLink
209130

0 commit comments

Comments
 (0)