Skip to content

Commit 949f827

Browse files
committed
font-lock: highlight operators with "builtin" face
What face is the most appropriate is arguable. Emacs 29.1 has "operator-face", but it's unavailable for older Emacs, and even for newer versions it's just "nil", so no highlight. Kinda pointless face. The current "variable-name" is definitely wrong though, because operators are far from being variables. And there's a separate "color-identifiers-mode" which uses this face to highlight similar variables, and that would work wrong for purescript-mode. Thus, replace the highlight to "builtin".
1 parent d150f6d commit 949f827

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

purescript-font-lock.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
;; This is probably just wrong, but it used to use
129129
;; `font-lock-function-name-face' with a result that was not consistent with
130130
;; other major modes, so I just exchanged with `purescript-definition-face'.
131-
(defvar purescript-operator-face 'font-lock-variable-name-face)
131+
(defvar purescript-operator-face 'font-lock-builtin-face)
132132
(defvar purescript-default-face nil)
133133
(defvar purescript-literate-comment-face 'font-lock-doc-face
134134
"Face with which to fontify literate comments.

tests/purescript-font-lock-tests.el

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ import Data.Either (Either(..))
5555
(53 58 font-lock-keyword-face)
5656
(60 70 font-lock-type-face)
5757
(73 78 font-lock-type-face)
58-
(80 81 font-lock-variable-name-face))))
58+
(80 81 font-lock-builtin-face))))
5959

6060
(ert-deftest string ()
6161
(purescript-test-ranges
6262
"foo = \"hello\""
6363
'((1 3 font-lock-function-name-face)
64-
(5 5 font-lock-variable-name-face)
64+
(5 5 font-lock-builtin-face)
6565
(7 13 font-lock-string-face))))
6666

6767
(ert-deftest multiline-string ()
@@ -71,7 +71,7 @@ hello
7171
\"\"\"
7272
"
7373
'((1 3 font-lock-function-name-face)
74-
(5 5 font-lock-variable-name-face)
74+
(5 5 font-lock-builtin-face)
7575
(7 19 font-lock-string-face))))
7676

7777
(ert-deftest multiline-string-with-hash ()
@@ -85,7 +85,7 @@ hello
8585
\"\"\"
8686
"
8787
'((1 3 font-lock-function-name-face)
88-
(5 5 font-lock-variable-name-face)
88+
(5 5 font-lock-builtin-face)
8989
(7 114 font-lock-string-face))))
9090

9191
(ert-deftest multiline-string-with-embedded-strings ()
@@ -96,7 +96,7 @@ this = \"still a string\"
9696
\"\"\"
9797
"
9898
'((1 3 font-lock-function-name-face)
99-
(5 5 font-lock-variable-name-face)
99+
(5 5 font-lock-builtin-face)
100100
(7 37 font-lock-string-face))))
101101

102102
(ert-deftest docs-bar-comment-different-spacings ()
@@ -163,11 +163,11 @@ noncomment
163163
(5 5 nil)
164164
(6 14 font-lock-type-face)
165165
(15 21 nil)
166-
(22 22 font-lock-variable-name-face)
166+
(22 22 font-lock-builtin-face)
167167
(23 23 nil)
168168
(24 29 font-lock-type-face)
169169
(30 37 nil)
170-
(38 39 font-lock-variable-name-face)
170+
(38 39 font-lock-builtin-face)
171171
(40 40 nil)
172172
(41 43 font-lock-type-face)
173173
(44 45 nil))))
@@ -205,47 +205,47 @@ mkMyComponent = do
205205
"
206206
'((1 13 font-lock-function-name-face)
207207
(14 14 nil)
208-
(15 16 font-lock-variable-name-face)
208+
(15 16 font-lock-builtin-face)
209209
(17 17 nil)
210210
(18 26 font-lock-type-face)
211211
(27 30 nil)
212212
(31 43 font-lock-function-name-face)
213213
(44 44 nil)
214-
(45 45 font-lock-variable-name-face)
214+
(45 45 font-lock-builtin-face)
215215
(46 46 nil)
216216
(47 48 font-lock-keyword-face)
217217
(49 61 nil)
218-
(62 63 font-lock-variable-name-face)
218+
(62 63 font-lock-builtin-face)
219219
(64 65 nil)
220220
(66 72 font-lock-type-face)
221221
(73 73 nil)
222-
(74 75 font-lock-variable-name-face)
222+
(74 75 font-lock-builtin-face)
223223
(76 76 nil)
224224
(77 79 font-lock-type-face)
225225
(80 81 nil)
226-
(82 83 font-lock-variable-name-face)
226+
(82 83 font-lock-builtin-face)
227227
(84 104 nil)
228228
(105 119 font-lock-string-face)
229229
(120 120 nil)
230-
(121 121 font-lock-variable-name-face)
230+
(121 121 font-lock-builtin-face)
231231
(122 122 font-lock-keyword-face)
232232
(123 123 nil)
233-
(124 125 font-lock-variable-name-face)
233+
(124 125 font-lock-builtin-face)
234234
(126 126 nil)
235235
(127 131 font-lock-type-face)
236-
(132 132 font-lock-variable-name-face)
236+
(132 132 font-lock-builtin-face)
237237
(133 134 font-lock-keyword-face)
238238
(135 149 nil)
239-
(150 151 font-lock-variable-name-face)
239+
(150 151 font-lock-builtin-face)
240240
(152 152 nil)
241241
(153 159 font-lock-type-face)
242242
(160 160 nil)
243-
(161 162 font-lock-variable-name-face)
243+
(161 162 font-lock-builtin-face)
244244
(163 181 nil)
245-
(182 182 font-lock-variable-name-face)
245+
(182 182 font-lock-builtin-face)
246246
(183 183 nil)
247247
(184 184 font-lock-type-face)
248-
(185 185 font-lock-variable-name-face)
248+
(185 185 font-lock-builtin-face)
249249
(186 192 nil)
250250
(193 194 font-lock-type-face)
251251
(195 195 nil))))
@@ -264,43 +264,43 @@ instance semigroupNonEmptyList :: Semigroup (NonEmptyList a) where
264264
derive newtype instance foldableNonEmptyList :: Foldable NonEmptyList
265265
"
266266
'((1 8 font-lock-keyword-face) (9 28 nil)
267-
(29 30 font-lock-variable-name-face) (31 31 nil)
267+
(29 30 font-lock-builtin-face) (31 31 nil)
268268
(32 37 font-lock-type-face) (38 38 nil)
269269
(39 50 font-lock-type-face) (51 51 nil)
270270
(52 56 font-lock-keyword-face) (57 69 nil)
271-
(70 70 font-lock-variable-name-face) (71 71 nil)
271+
(70 70 font-lock-builtin-face) (71 71 nil)
272272
(72 83 font-lock-type-face) (84 85 nil)
273273
(86 86 font-lock-keyword-face) (87 87 nil)
274274
(88 89 font-lock-type-face) (90 95 nil)
275-
(96 96 font-lock-variable-name-face) (97 101 nil)
275+
(96 96 font-lock-builtin-face) (97 101 nil)
276276
(102 113 font-lock-type-face) (114 119 nil)
277277
(120 121 font-lock-type-face) (122 137 nil)
278278
(138 138 font-lock-type-face) (139 139 nil)
279279
(140 142 font-lock-type-face) (143 147 nil)
280280
(148 148 font-lock-type-face) (149 149 nil)
281281
(150 152 font-lock-type-face) (153 158 nil)
282-
(159 159 font-lock-variable-name-face) (160 168 nil)
282+
(159 159 font-lock-builtin-face) (160 168 nil)
283283
(169 173 font-lock-keyword-face) (174 196 nil)
284-
(197 197 font-lock-variable-name-face) (198 203 nil)
284+
(197 197 font-lock-builtin-face) (198 203 nil)
285285
(204 204 font-lock-type-face) (205 208 nil)
286286
(209 220 font-lock-type-face) (221 224 nil)
287287
(225 226 font-lock-type-face) (227 233 nil)
288288
(234 234 font-lock-type-face) (235 243 nil)
289289
(244 244 font-lock-type-face) (245 247 nil)
290290
(248 248 font-lock-type-face) (249 255 nil)
291291
(256 263 font-lock-keyword-face) (264 286 nil)
292-
(287 288 font-lock-variable-name-face) (289 289 nil)
292+
(287 288 font-lock-builtin-face) (289 289 nil)
293293
(290 298 font-lock-type-face) (299 300 nil)
294294
(301 312 font-lock-type-face) (313 316 nil)
295295
(317 321 font-lock-keyword-face) (322 332 nil)
296296
(333 344 font-lock-type-face) (345 348 nil)
297297
(349 350 font-lock-type-face) (351 360 nil)
298-
(361 361 font-lock-variable-name-face) (362 366 nil)
298+
(361 361 font-lock-builtin-face) (362 366 nil)
299299
(367 378 font-lock-type-face) (379 382 nil)
300300
(383 384 font-lock-type-face) (385 388 nil)
301-
(389 390 font-lock-variable-name-face) (391 403 nil)
301+
(389 390 font-lock-builtin-face) (391 403 nil)
302302
(404 409 font-lock-keyword-face) (410 448 nil)
303-
(449 450 font-lock-variable-name-face) (451 451 nil)
303+
(449 450 font-lock-builtin-face) (451 451 nil)
304304
(452 459 font-lock-type-face) (460 460 nil)
305305
(461 472 font-lock-type-face) (473 473 nil))))
306306

@@ -319,7 +319,7 @@ foreign importinvalid
319319
(8 8 nil)
320320
(9 14 font-lock-keyword-face)
321321
(15 21 nil)
322-
(22 23 font-lock-variable-name-face)
322+
(22 23 font-lock-builtin-face)
323323
(24 24 nil)
324324
(25 30 font-lock-type-face)
325325
(31 31 nil)
@@ -329,7 +329,7 @@ foreign importinvalid
329329
(43 43 nil)
330330
(44 49 font-lock-keyword-face)
331331
(50 58 nil)
332-
(59 60 font-lock-variable-name-face)
332+
(59 60 font-lock-builtin-face)
333333
(61 61 nil)
334334
(62 67 font-lock-type-face)
335335
(68 68 nil)
@@ -339,7 +339,7 @@ foreign importinvalid
339339
(80 80 nil)
340340
(81 86 font-lock-keyword-face)
341341
(87 95 nil)
342-
(96 97 font-lock-variable-name-face)
342+
(96 97 font-lock-builtin-face)
343343
(98 98 nil)
344344
(99 104 font-lock-type-face)
345345
(105 105 nil)
@@ -398,113 +398,113 @@ arr = 1 : [2,3]
398398
(24 25 nil)
399399
(26 30 font-lock-type-face)
400400
(31 31 nil)
401-
(32 33 font-lock-variable-name-face)
401+
(32 33 font-lock-builtin-face)
402402
(34 37 nil)
403403
(38 40 font-lock-comment-delimiter-face)
404404
(41 50 font-lock-comment-face)
405405
(51 52 font-lock-function-name-face)
406406
(53 53 nil)
407-
(54 55 font-lock-variable-name-face)
407+
(54 55 font-lock-builtin-face)
408408
(56 58 nil)
409-
(59 60 font-lock-variable-name-face)
409+
(59 60 font-lock-builtin-face)
410410
(61 63 nil)
411411
(64 65 font-lock-function-name-face)
412412
(66 66 nil)
413-
(67 67 font-lock-variable-name-face)
413+
(67 67 font-lock-builtin-face)
414414
(68 68 nil)
415-
(69 69 font-lock-variable-name-face)
415+
(69 69 font-lock-builtin-face)
416416
(70 71 nil)
417-
(72 73 font-lock-variable-name-face)
417+
(72 73 font-lock-builtin-face)
418418
(74 77 nil)
419419
(78 80 font-lock-comment-delimiter-face)
420420
(81 83 font-lock-comment-face)
421421
(84 87 font-lock-function-name-face)
422422
(88 88 nil)
423-
(89 89 font-lock-variable-name-face)
423+
(89 89 font-lock-builtin-face)
424424
(90 90 nil)
425425
(91 92 font-lock-keyword-face)
426426
(93 97 nil)
427-
(98 99 font-lock-variable-name-face)
427+
(98 99 font-lock-builtin-face)
428428
(100 118 nil)
429429
(119 121 font-lock-comment-delimiter-face)
430430
(122 130 font-lock-comment-face)
431431
(131 137 font-lock-function-name-face)
432432
(138 138 nil)
433-
(139 140 font-lock-variable-name-face)
433+
(139 140 font-lock-builtin-face)
434434
(141 141 nil)
435435
(142 145 font-lock-type-face)
436436
(146 148 nil)
437-
(149 150 font-lock-variable-name-face)
437+
(149 150 font-lock-builtin-face)
438438
(151 153 nil)
439-
(154 155 font-lock-variable-name-face)
439+
(154 155 font-lock-builtin-face)
440440
(156 156 nil)
441441
(157 162 font-lock-type-face)
442442
(163 163 nil)
443443
(164 170 font-lock-function-name-face)
444444
(171 171 nil)
445-
(172 172 font-lock-variable-name-face)
445+
(172 172 font-lock-builtin-face)
446446
(173 179 nil)
447447
(180 182 font-lock-comment-delimiter-face)
448448
(183 184 font-lock-comment-face)
449449
(185 193 font-lock-function-name-face)
450450
(194 195 nil)
451-
(196 196 font-lock-variable-name-face)
451+
(196 196 font-lock-builtin-face)
452452
(197 197 nil)
453453
(198 201 font-lock-type-face)
454454
(202 202 nil)
455455
(203 203 font-lock-keyword-face)
456456
(204 205 nil)
457-
(206 206 font-lock-variable-name-face)
457+
(206 206 font-lock-builtin-face)
458458
(207 210 nil)
459459
(211 213 font-lock-comment-delimiter-face)
460460
(214 221 font-lock-comment-face)
461461
(222 225 font-lock-function-name-face)
462462
(226 228 nil)
463-
(229 229 font-lock-variable-name-face)
463+
(229 229 font-lock-builtin-face)
464464
(230 232 nil)
465-
(233 233 font-lock-variable-name-face)
465+
(233 233 font-lock-builtin-face)
466466
(234 236 nil)
467-
(237 237 font-lock-variable-name-face)
467+
(237 237 font-lock-builtin-face)
468468
(238 238 nil)
469-
(239 239 font-lock-variable-name-face)
469+
(239 239 font-lock-builtin-face)
470470
(240 248 nil)
471-
(249 249 font-lock-variable-name-face)
471+
(249 249 font-lock-builtin-face)
472472
(250 260 nil)
473-
(261 261 font-lock-variable-name-face)
473+
(261 261 font-lock-builtin-face)
474474
(262 265 nil)
475475
(266 268 font-lock-comment-delimiter-face)
476476
(269 284 font-lock-comment-face)
477477
(285 296 font-lock-function-name-face)
478478
(297 297 nil)
479-
(298 298 font-lock-variable-name-face)
479+
(298 298 font-lock-builtin-face)
480480
(299 307 nil)
481-
(308 308 font-lock-variable-name-face)
481+
(308 308 font-lock-builtin-face)
482482
(309 309 nil)
483483
(310 319 font-lock-type-face)
484484
(320 322 nil)
485-
(323 324 font-lock-variable-name-face)
485+
(323 324 font-lock-builtin-face)
486486
(325 325 nil)
487487
(326 329 font-lock-type-face)
488488
(330 330 nil)
489-
(331 332 font-lock-variable-name-face)
489+
(331 332 font-lock-builtin-face)
490490
(333 335 nil)
491491
(336 347 font-lock-function-name-face)
492492
(348 348 nil)
493-
(349 349 font-lock-variable-name-face)
493+
(349 349 font-lock-builtin-face)
494494
(350 361 nil)
495495
(362 364 font-lock-comment-delimiter-face)
496496
(365 381 font-lock-comment-face)
497497
(382 384 font-lock-function-name-face)
498498
(385 385 nil)
499-
(386 387 font-lock-variable-name-face)
499+
(386 387 font-lock-builtin-face)
500500
(388 388 nil)
501501
(389 393 font-lock-type-face)
502502
(394 394 nil)
503503
(395 397 font-lock-type-face)
504504
(398 398 nil)
505505
(399 401 font-lock-function-name-face)
506506
(402 402 nil)
507-
(403 403 font-lock-variable-name-face)
507+
(403 403 font-lock-builtin-face)
508508
(404 406 nil)
509509
(407 407 font-lock-type-face)
510510
(408 414 nil))))

0 commit comments

Comments
 (0)