procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(font-lock-regexp-face): New face

Browse source 
* lisp/font-lock.el (font-lock-regexp-face): New face.

* lisp/progmodes/typescript-ts-mode.el
(typescript-ts-mode--font-lock-settings):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts--font-lock-settings):
* lisp/progmodes/js.el (js--treesit-font-lock-settings):
Use it for regexps.

* etc/NEWS: Mention the addition.
This commit is contained in:
Dmitry Gutov 2023-01-06 19:56:20 +02:00
parent 5ab03bcc43
commit 2ea6ee5cbf
5 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/NEWS
View file

@ -798,6 +798,7 @@ filter/sentinel error has been handled.
These faces are primarily meant for use with tree-sitter. They are: These faces are primarily meant for use with tree-sitter. They are:
'font-lock-bracket-face', 'font-lock-delimiter-face', 'font-lock-bracket-face', 'font-lock-delimiter-face',
'font-lock-escape-face', 'font-lock-number-face', 'font-lock-escape-face', 'font-lock-number-face',
'font-lock-regexp-face',
'font-lock-misc-punctuation-face', 'font-lock-operator-face', 'font-lock-misc-punctuation-face', 'font-lock-operator-face',
'font-lock-property-face', and 'font-lock-punctuation-face'. 'font-lock-property-face', and 'font-lock-punctuation-face'.

6
lisp/font-lock.el
View file

@ -2073,6 +2073,12 @@ as the constructs of Haddock, Javadoc and similar systems."
"Font Lock mode face used to highlight preprocessor directives." "Font Lock mode face used to highlight preprocessor directives."
:group 'font-lock-faces) :group 'font-lock-faces)
(defface font-lock-regexp-face
'((t :inherit font-lock-string-face))
"Font Lock mode face used to highlight regexp literals."
:group 'font-lock-faces
:version "29.1")
(defface font-lock-regexp-grouping-backslash (defface font-lock-regexp-grouping-backslash
'((t :inherit bold)) '((t :inherit bold))
"Font Lock mode face for backslashes in Lisp regexp grouping constructs." "Font Lock mode face for backslashes in Lisp regexp grouping constructs."

2
lisp/progmodes/js.el
View file

@ -3498,7 +3498,7 @@ This function is intended for use in `after-change-functions'."
:language 'javascript :language 'javascript
:feature 'string :feature 'string
'((regex pattern: (regex_pattern)) @font-lock-string-face '((regex pattern: (regex_pattern)) @font-lock-regexp-face
(string) @font-lock-string-face) (string) @font-lock-string-face)
:language 'javascript :language 'javascript

6
lisp/progmodes/ruby-ts-mode.el
View file

@ -227,10 +227,8 @@ values of OVERRIDE"
;; Also before 'operator because % and / are operators ;; Also before 'operator because % and / are operators
:language language :language language
:feature 'regexp :feature 'regexp
;; TODO: We probably need a separate face for regexps everywhere. '((regex "/" @font-lock-regexp-face)
;; Maybe another one for regexp delimiters as well. (regex _ (string_content) @font-lock-regexp-face))
'((regex "/" @font-lock-string-face)
(regex _ (string_content) @font-lock-string-face))
:language language :language language
:feature 'operator :feature 'operator

2
lisp/progmodes/typescript-ts-mode.el
View file

@ -151,7 +151,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
:language language :language language
:override t :override t
:feature 'string :feature 'string
`((regex pattern: (regex_pattern)) @font-lock-string-face `((regex pattern: (regex_pattern)) @font-lock-regexp-face
(string) @font-lock-string-face (string) @font-lock-string-face
(template_string) @js--fontify-template-string (template_string) @js--fontify-template-string
(template_substitution ["${" "}"] @font-lock-misc-punctuation-face)) (template_substitution ["${" "}"] @font-lock-misc-punctuation-face))