>From 97b8d72f5fd8211d7244089c8fa1a1f2226ced0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Mon, 28 Mar 2016 14:31:49 +0200 Subject: [PATCH] Support completion of bang-rules in CSS mode lisp/textmodes/css-mode.el (css--bang-ids): New buffer-local variable holding the list of bang-rules for the current mode. (css--font-lock-keywords): Retrieve bang-rules from `css--bang-ids' instead of computing them. (css--complete-bang-rule): New function for completing a bang-rule. (css-completion-at-point): Add support for completing bang-rules. (scss-font-lock-keywords): Change from a variable to a function in order to recompute `css--font-lock-keywords' when `css--bang-ids' has changed. (scss-mode): Include SCSS-specific completion rules. --- etc/NEWS | 4 ++-- lisp/textmodes/css-mode.el | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 66777e9..726b4b9 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -144,8 +144,8 @@ different group ID. ** CSS mode --- -*** Support for completing attribute values using the 'completion-at-point' -command. +*** Support for completing attribute values and bang-rules using the +'completion-at-point' command. * New Modes and Packages in Emacs 25.2 diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index fd3459e..cbef3d4 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -64,6 +64,10 @@ scss-bang-ids '("default" "global" "optional") "Additional identifiers that appear in the form !foo in SCSS.") +(defvar css--bang-ids css-bang-ids + "List of bang-rules for the current mode.") +(make-variable-buffer-local 'css--bang-ids) + (defconst css-descriptor-ids '("ascent" "baseline" "bbox" "cap-height" "centerline" "definition-src" "descent" "font-family" "font-size" "font-stretch" "font-style" @@ -600,9 +604,7 @@ css-proprietary-property "Face to use for vendor-specific properties.") (defun css--font-lock-keywords (&optional sassy) - `((,(concat "!\\s-*" - (regexp-opt (append (if sassy scss-bang-ids) - css-bang-ids))) + `((,(concat "!\\s-*" (regexp-opt 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 @@ -732,6 +734,14 @@ css--complete-property (when (memq (char-before) '(?\{ ?\;)) (list start pos css-property-ids)))))) +(defun css--complete-bang-rule () + "Complete bang-rule at point." + (save-excursion + (let ((pos (point))) + (skip-chars-backward "-[:alnum:]") + (when (eq (char-before) ?\!) + (list (point) pos css--bang-ids))))) + (defun css--complete-pseudo-element-or-class () "Complete pseudo-element or pseudo-class at point." (save-excursion @@ -798,8 +808,9 @@ css--complete-property-value (defun css-completion-at-point () "Complete current symbol at point. Currently supports completion of CSS properties, property values, -pseudo-elements, pseudo-classes, and at-rules." +pseudo-elements, pseudo-classes, at-rules, and bang-rules." (or (css--complete-property) + (css--complete-bang-rule) (css--complete-property-value) (css--complete-pseudo-element-or-class) (css--complete-at-rule))) @@ -937,7 +948,7 @@ scss-mode-syntax-table (modify-syntax-entry ?$ "'" st) st)) -(defvar scss-font-lock-keywords +(defun scss-font-lock-keywords () (append `((,(concat "$" css-ident-re) (0 font-lock-variable-name-face))) (css--font-lock-keywords 'sassy) `((,(concat "@mixin[ \t]+\\(" css-ident-re "\\)[ \t]*(") @@ -958,7 +969,9 @@ scss-mode (setq-local comment-continue " *") (setq-local comment-start-skip "/[*/]+[ \t]*") (setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)") - (setq-local font-lock-defaults '(scss-font-lock-keywords nil t))) + (setq-local css--bang-ids (append css-bang-ids scss-bang-ids)) + (setq-local font-lock-defaults + (list (scss-font-lock-keywords) nil t))) (provide 'css-mode) ;;; css-mode.el ends here -- 2.8.0.rc3