Skip to content

Syntax highlight comment reader macro as a comment #15

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

Merged
merged 2 commits into from
Mar 7, 2021
Merged

Syntax highlight comment reader macro as a comment #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33da5c2
Syntax highlight use of the comment reader macro as comments
axvr Mar 4, 2021
b2caef4
fixup! Syntax highlight use of the comment reader macro as comments
axvr Mar 5, 2021
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
3 changes: 2 additions & 1 deletion indent/clojure.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ if exists("*searchpairpos")
endfunction

function! s:ignored_region()
return s:syn_id_name() =~? '\vstring|regex|comment|character'
let name = s:syn_id_name()
return (name =~? '\vstring|regex|comment|character') && (name !=# 'clojureCommentReaderMacro')
endfunction

function! s:current_char()
Expand Down
15 changes: 14 additions & 1 deletion syntax/clojure.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,20 @@ syntax keyword clojureCommentTodo contained FIXME XXX TODO BUG NOTE HACK FIXME:
syntax match clojureComment ";.*$" contains=clojureCommentTodo,@Spell
syntax match clojureComment "#!.*$"

" Comment forms highlight comment forms as comment. Based on: <https://git.sr.ht/~evhan/vim-scheme/>
syntax region clojureCommentReaderMacro matchgroup=clojureCommentReaderMacro start=/#_[ ,\t\n`'~]*/ end=/[, \t\n()\[\]{}";]/me=e-1
syntax region clojureCommentReaderMacro matchgroup=clojureCommentReaderMacro start=/#_[ ,\t\n`'~]*"/ skip=/\\[\\"]/ end=/"/
syntax region clojureCommentReaderMacro matchgroup=clojureCommentReaderMacro start=/#_[ ,\t\n`'~]*(/ end=/)/ contains=clojureCommentReaderMacroForm
syntax region clojureCommentReaderMacro matchgroup=clojureCommentReaderMacro start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureCommentReaderMacroForm
syntax region clojureCommentReaderMacro matchgroup=clojureCommentReaderMacro start=/#_[ ,\t\n`'~]*{/ end=/}/ contains=clojureCommentReaderMacroForm

syntax region clojureCommentReaderMacroForm start="(" end=")" contained contains=clojureCommentReaderMacroForm
syntax region clojureCommentReaderMacroForm start="{" end="}" contained contains=clojureCommentReaderMacroForm
syntax region clojureCommentReaderMacroForm start="\[" end="\]" contained contains=clojureCommentReaderMacroForm

" -*- TOP CLUSTER -*-
" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector
syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector,clojureCommentReaderMacro

syntax region clojureSexp matchgroup=clojureParen start="(" end=")" contains=@clojureTop fold
syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
Expand Down Expand Up @@ -191,6 +202,8 @@ highlight default link clojureDispatch SpecialChar

highlight default link clojureComment Comment
highlight default link clojureCommentTodo Todo
highlight default link clojureCommentReaderMacro clojureComment
highlight default link clojureCommentReaderMacroForm clojureCommentReaderMacro

highlight default link clojureError Error

Expand Down