Skip to content

Comprehensive regular expression support #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Comprehensive regular expression support #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cd9f7d
Add new syntax match group "clojureStringEscape"
noprompt Mar 9, 2013
72114c2
Merge remote-tracking branch 'upstream/master'
noprompt Mar 9, 2013
befb009
Create comprehensive regular expression syntax groups
noprompt Mar 10, 2013
71f1ae6
Correction to clojureRegexpBoundary
noprompt Mar 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions syntax/clojure.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\
syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained

syntax region clojureString start=/"/ skip=/\\"/ end=/"/ contains=clojureStringEscape
syntax region clojureRegexp start=/\#"/ skip=/\\"/ end=/"/

syntax match clojureCharacter "\\."
syntax match clojureCharacter "\\o\%([0-3]\o\{2\}\|\o\{1,2\}\)"
Expand All @@ -55,10 +54,12 @@ for s:radix in range(2, 36)
endfor
unlet! s:radix_chars s:radix

syntax match clojureNumber "\<-\=\d\+\(\.\d*\)\=\(M\|\([eE][-+]\?\d\+\)\)\?\>"
syntax match clojureNumber "\<-\=\d\+N\?\>"
syntax match clojureNumber "\<-\=0x\x\+\>"
syntax match clojureNumber "\<-\=\d\+/\d\+\>"
syntax match clojureSymbol "\v([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+(:?([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"

syntax match clojureNumber "\<[-+]\=\d\+\(\.\d*\)\=\(M\|\([eE][-+]\?\d\+\)\)\?\>"
syntax match clojureNumber "\<[-+]\=\d\+N\?\>"
syntax match clojureNumber "\<[-+]\=0x\x\+\>"
syntax match clojureNumber "\<[-+]\=\d\+/\d\+\>"

syntax match clojureVarArg "&"

Expand All @@ -73,7 +74,31 @@ syntax match clojureDispatch "\v#[\^'=<_]?"
" Clojure permits no more than 20 params.
syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"

syntax match clojureSymbol "\v([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+(:?([a-zA-Z0-9!#$%&*_+=|'<.>?-]|[^\x00-\x7F]))*[#:]@<!"
syntax match clojureRegexpChar "\\." contained
syntax match clojureRegexpSpecialChar "\v\\{2}|\\%([tnrfae]|c.|0%([0-7]{1,2}|[0-3][0-7]{2})|x\x{2}|u\x{4})" contained
syntax cluster clojureRegexpChars contains=clojureRegexpChar,clojureRegexpSpecialChar
" Charactar classes
syntax match clojureRegexpPredefinedCharClass "\\[dDsSwW]" contained
syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Lower|Upper|ASCII|Alpha|Digit|Alnum|Punct|Graph|Print|Blank|Cntrl|XDigit|Space|IsLatin|InGreek|Lu|IsAlphabetic|Sc|java%(LowerCase|UpperCase|Whitespace|Mirrored))\}" contained
syntax region clojureRegexpCharClass start="\\\@<!\[" end="\\\@<!\]" contained contains=clojureRegexpCharClasses,@clojureRegexpChars
syntax cluster clojureRegexpCharClasses contains=clojureRegexpPredefinedCharClass,clojureRegexpPosixCharClass,clojureRegexpCharClass
" Boundary
syntax match clojureRegexpBoundary "\v\\[bBAGZz]" contained
syntax match clojureRegexpBoundary "\v\<@![\^$]" contained
" Quantification
syntax match clojureRegexpQuantifier "\v\\@<![?*+]\??" contained
syntax match clojureRegexpQuantifier "\v\\@<!\{\d+%(,|,\d+)?}\??" contained
syntax match clojureRegexpOr "\v\<@!\|" contained
" Back references
syntax match clojureRegexpBackRef "\v\\%(\d+|k\<[a-zA-z]+\>)" contained
" Mode modifiers, mode-modified spans, lookaround, regular and atomic
" grouping, and named-capturing.
syntax match clojureRegexpMod "\v\(@<=\?[xdsmiu]?:?" contained
syntax match clojureRegexpMod "\v\(@<=\?[=!>]" contained
syntax match clojureRegexpMod "\v\(@<=\?\<[a-zA-Z]+\>" contained

syntax region clojureRegexpGroup start="\\\@<!(" matchgroup=clojureRegexpGroup end="\\\@<!)" contained contains=clojureRegexpMod,@clojureRegexpCharClasses
syntax region clojureRegexp start=/\#"/ skip=/\\"/ end=/"/ contains=@clojureRegexpChars,@clojureRegexpCharClasses,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup

syntax match clojureComment ";.*$" contains=clojureTodo,@Spell
syntax match clojureComment "#!.*$"
Expand All @@ -98,6 +123,17 @@ highlight default link clojureString String
highlight default link clojureStringEscape Character
highlight default link clojureRegexp Constant

highlight default link clojureRegexpChar Character
highlight default link clojureRegexpSpecialChar Character
highlight default link clojureRegexpCharClass Special
highlight default link clojureRegexpPosixCharClass Special
highlight default link clojureRegexpPredefinedCharClass Special
highlight default link clojureRegexpBoundary Special
highlight default link clojureRegexpMod Special
highlight default link clojureRegexpOr Special
highlight default link clojureRegexpBackRef Special
highlight default link clojureRegexpGroup clojureRegexp

highlight default link clojureVariable Identifier
highlight default link clojureCond Conditional
highlight default link clojureDefine Define
Expand Down