Rename "comment reader macro" to "discard"

This also solves the problem where "comment" needed to be misspelt for
vim-sexp would work correctly.

Author: axvr

indent/clojure.vim

@@ -56,8 +56,7 @@ if exists("*searchpairpos")
 	endfunction
 
 	function! s:ignored_region()
-		let name = s:syn_id_name()
-		return (name =~? '\vstring|regex|comment|character') && (name !~# '^clojureCommentReaderMacro\(Form\)\?$')
+		return s:syn_id_name() =~? '\vstring|regex|comment|character'
 	endfunction
 
 	function! s:current_char()

syntax/clojure.vim

@@ -134,20 +134,21 @@ 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 clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*/   end=/[, \t\n()\[\]{}";]/me=e-1
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*"/  skip=/\\[\\"]/ end=/"/
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*(/  end=/)/  contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*{/  end=/}/  contains=clojureComentReaderMacroForm
-
-syntax region clojureComentReaderMacroForm start="("  end=")"  contained contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacroForm start="{"  end="}"  contained contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacroForm start="\[" end="\]" contained contains=clojureComentReaderMacroForm
+" Comment out discarded forms.  <https://clojure.org/guides/weird_characters#_discard>
+" TODO: stacking support and/or option to enable/disable this.
+syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*/   end=/[, \t\n()\[\]{}";]/me=e-1
+syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*"/  skip=/\\[\\"]/ end=/"/
+syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*(/  end=/)/  contains=clojureDiscardForm
+syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureDiscardForm
+syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*{/  end=/}/  contains=clojureDiscardForm
+
+syntax region clojureDiscardForm start="("  end=")"  contained contains=clojureDiscardForm
+syntax region clojureDiscardForm start="{"  end="}"  contained contains=clojureDiscardForm
+syntax region clojureDiscardForm start="\[" end="\]" contained contains=clojureDiscardForm
 
 " -*- 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,clojureComentReaderMacro
+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,clojureDiscard
 
 syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
 syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
@@ -202,8 +203,8 @@ highlight default link clojureDispatch                  SpecialChar
 
 highlight default link clojureComment                   Comment
 highlight default link clojureCommentTodo               Todo
-highlight default link clojureComentReaderMacro         clojureComment
-highlight default link clojureComentReaderMacroForm     clojureComentReaderMacro
+highlight default link clojureDiscard                   clojureComment
+highlight default link clojureDiscardForm               clojureDiscard
 
 highlight default link clojureError                     Error