Skip to content

Commit 4096113

Browse files
nopromptnoprompt
committed
Fix accidentally damaged char class, tidy up
1 parent de6f51c commit 4096113

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎clj/src/vim_clojure_static/generate.clj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,27 @@
171171

172172
(def vim-unicode-category-char-classes
173173
"Vimscript literal `syntax match` for Unicode General Category classes."
174-
(let [table (group-by first (map seq (:category character-properties)))
175-
cats (map str (keys table))
176-
subcats (map (fn [[c sc]]
177-
(format "%s[%s]?" c (apply str (sort (mapcat rest sc)))))
178-
table)]
174+
(let [cats (:category character-properties)
175+
chrs (->> (map seq cats)
176+
(group-by first)
177+
(keys)
178+
(map str))]
179179
;; gc= and general_category= can be case insensitive, but this is behavior
180180
;; is undefined.
181181
(str
182182
(syntax-match-properties
183183
:clojureRegexpUnicodeCharClass
184184
"%s"
185-
(:category character-properties)
185+
chrs
186186
false)
187187
(syntax-match-properties
188188
:clojureRegexpUnicodeCharClass
189189
"%s"
190-
(:category character-properties))
190+
cats)
191191
(syntax-match-properties
192192
:clojureRegexpUnicodeCharClass
193193
"%%(Is|gc\\=|general_category\\=)?%s"
194-
(:category character-properties)))))
194+
cats))))
195195

196196
(def vim-unicode-script-char-classes
197197
"Vimscript literal `syntax match` for Unicode Script properties."
@@ -229,26 +229,26 @@
229229
(fmt "script=" :script)
230230
(fmt "block=" :block)])))
231231

232-
;;comment
233-
;; Generate the vim literal definitions for pasting into the runtime files.
234-
(spit "tmp/clojure-defs.vim"
235-
(str generation-comment
236-
clojure-version-comment
237-
vim-syntax-keywords
238-
\newline
239-
generation-comment
240-
clojure-version-comment
241-
vim-completion-words
242-
\newline
243-
generation-comment
244-
java-version-comment
245-
vim-posix-char-classes
246-
vim-java-char-classes
247-
vim-unicode-binary-char-classes
248-
vim-unicode-category-char-classes
249-
vim-unicode-script-char-classes
250-
vim-unicode-block-char-classes))
251-
;; Generate an example file with all possible character property literals.
252-
(spit "tmp/all-char-props.clj"
253-
comprehensive-clojure-character-property-regexps)
232+
(comment
233+
;; Generate the vim literal definitions for pasting into the runtime files.
234+
(spit "tmp/clojure-defs.vim"
235+
(str generation-comment
236+
clojure-version-comment
237+
vim-syntax-keywords
238+
\newline
239+
generation-comment
240+
clojure-version-comment
241+
vim-completion-words
242+
\newline
243+
generation-comment
244+
java-version-comment
245+
vim-posix-char-classes
246+
vim-java-char-classes
247+
vim-unicode-binary-char-classes
248+
vim-unicode-category-char-classes
249+
vim-unicode-script-char-classes
250+
vim-unicode-block-char-classes))
251+
;; Generate an example file with all possible character property literals.
252+
(spit "tmp/all-char-props.clj"
253+
comprehensive-clojure-character-property-regexps))
254254

‎syntax/clojure.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ syntax region clojureRegexpQuote start=/\\Q/ skip=/\\\\\|\\"/ end=/\\E/
8585
syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Blank|P%(unct|rint)|Digit|Graph|A%(l%(pha|num)|SCII)|XDigit|Space|Upper|Lower|Cntrl)\}" contained display
8686
syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(U%(pperCase|nicodeIdentifier%(Start|Part))|Mirrored|Alphabetic|SpaceChar|D%(efined|igit)|Whitespace|L%(etter%(OrDigit)?|owerCase)|TitleCase|I%(de%(ographic|ntifierIgnorable)|SOControl)|JavaIdentifier%(Start|Part))\}" contained display
8787
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(blank|hex%(digit|_digit)|uppercase|digit|control|a%(ssigned|l%(phabetic|num))|graph|ideographic|p%(rint|unctuation)|titlecase|w%(hite%(_space|space)|ord)|l%(owercase|etter)|noncharacter%(codepoint|_code_point))\}" contained display
88-
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]%(C[fonsc]?|L[DmloutC]?|S[kmoc]?|P[edfiosc]?|M[enc]?|Z[lps]?|N[dlo]?)" contained display
88+
syntax match clojureRegexpUnicodeCharClass "\v\\[pP][MLNPSZC]" contained display
8989
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(C[fonsc]?|L[DmloutC]?|S[kmoc]?|P[edfiosc]?|M[enc]?|Z[lps]?|N[dlo]?)\}" contained display
9090
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category\=)?%(C[fonsc]?|L[DmloutC]?|S[kmoc]?|P[edfiosc]?|M[enc]?|Z[lps]?|N[dlo]?)\}" contained display
9191
syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(h%(ira%(gana)?|an%([io]|g%(ul)?|unoo)?|ebr%(ew)?)|yi%(ii)?|java%(nese)?|c%(prt|y%(r%(illic|l)|priot)|h%(er%(okee)?|am)|uneiform|o%(mmon|pt%(ic)?)|a%(n%(adian_aboriginal|s)|ri%(an)?))|i%(mperial_aramaic|tal|n%(herited|scriptional_pa%(rthian|hlavi)))|a%(r%(ab%(ic)?|m%([in]|enian))|v%(st|estan))|g%(oth%(ic)?|u%(j%(arati|r)|r%(mukhi|u))|lag%(olitic)?|eor%(gian)?|re%(k|ek))|b%(u%(gi%(nese)?|h%(d|id))|ra%(i%(lle)?|h%(mi)?)|a%(mum?|t%(k|ak)|li%(nese)?)|opo%(mofo)?|eng%(ali)?)|s%(ha%(w|vian)|und%(anese)?|y%(r%(iac|c)|lo%(ti_nagri)?)|inh%(ala)?|a%(ur%(ashtra)?|rb|m%(r|aritan)))|d%(srt|e%(va%(nagari)?|seret))|l%(a%(na|oo?|t%(n|in))|epc%(ha)?|i%(n%(ear_b|b)|mbu?|su)|y%([dc]i%(an)?))|p%(h%(oenician|nx|li|ag%(s_pa)?)|rti)|e%(gyp%(tian_hieroglyphs)?|thi%(opic)?)|r%(jng|un%(ic|r)|ejang)|u%(nknown|gar%(itic)?)|vaii?|n%(koo?|ew_tai_lue)|m%(y%(mr|anmar)|tei|a%(nd%(aic)?|layalam)|ong%(olian)?|eetei_mayek|lym)|z%(inh|yyy|zzz)|t%(glg|fng|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|elu%(gu)?|a%(i_%(viet|le|tham)|l[eu]|g%(alog|b%(anwa)?)|vt|m%(l|il)))|x%(sux|peo)|o%(r%(iya|kh|ya)|sma%(nya)?|g%(am|ham)|l%(ck|d_%(south_arabian|turkic|italic|persian)|_chiki))|k%(a%(takana|yah_li|n%(nada|a)|li|ithi)|h%(m%(r|er)|ar%(oshthi)?)|thi|nda))\}" contained display

0 commit comments

Comments
 (0)