diff options
| author | Simen Heggestøyl <simenheg@gmail.com> | 2016-02-01 21:38:25 +0100 |
|---|---|---|
| committer | Simen Heggestøyl <simenheg@gmail.com> | 2016-02-01 21:38:25 +0100 |
| commit | 1d07dcd720890764774770e0ad24ba11a5bda233 (patch) | |
| tree | 4a72b7ed09878ea11b9a012044c60c6d6fe0a4f9 /lisp/textmodes/css-mode.el | |
| parent | ee8b46699523cc1dea7b3d03e3cccff3d62cd847 (diff) | |
| download | emacs-1d07dcd720890764774770e0ad24ba11a5bda233.tar.gz emacs-1d07dcd720890764774770e0ad24ba11a5bda233.tar.bz2 emacs-1d07dcd720890764774770e0ad24ba11a5bda233.zip | |
Highlight two additional SCSS keywords
* lisp/textmodes/css-mode.el (css-bang-ids): New defconst holding CSS
identifiers on the form !foo.
(scss-bang-ids): New defconst holding SCSS identifiers on the form
!foo.
(css--font-lock-keywords): Highlight the new SCSS bang identifiers in
`font-lock-builtin-face'.
* test/indent/css-mode.css: Add bang rule test case.
* test/indent/scss-mode.css: Add test cases for the introduced bang
rules.
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 96a82baa56c..b3a41d3822c 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -54,6 +54,14 @@ '("charset" "font-face" "import" "media" "namespace" "page") "Identifiers that appear in the form @foo.") +(defconst css-bang-ids + '("important") + "Identifiers that appear in the form !foo.") + +(defconst scss-bang-ids + '("default" "global" "optional") + "Additional identifiers that appear in the form !foo in SCSS.") + (defconst css-descriptor-ids '("ascent" "baseline" "bbox" "cap-height" "centerline" "definition-src" "descent" "font-family" "font-size" "font-stretch" "font-style" @@ -236,8 +244,8 @@ (defun css--font-lock-keywords (&optional sassy) `((,(concat "!\\s-*" - (regexp-opt (append (if sassy '("global")) - '("important")))) + (regexp-opt (append (if sassy scss-bang-ids) + css-bang-ids))) (0 font-lock-builtin-face)) ;; Atrules keywords. IDs not in css-at-ids are valid (ignored). ;; In fact the regexp should probably be |