unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#23135: [PATCH] Support completion of bang-rules in CSS mode
@ 2016-03-28 12:52 Simen Heggestøyl
  2016-03-28 15:16 ` Stefan Monnier
  0 siblings, 1 reply; 5+ messages in thread
From: Simen Heggestøyl @ 2016-03-28 12:52 UTC (permalink / raw)
  To: 23135; +Cc: Stefan Monnier


[-- Attachment #1.1: Type: text/plain, Size: 120 bytes --]

The attached patch adds support for completing bang-rules (rules that
start with "!") in CSS and SCSS mode.

-- Simen



[-- Attachment #1.2: Type: text/html, Size: 177 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Support-completion-of-bang-rules-in-CSS-mode.patch --]
[-- Type: text/x-patch, Size: 3056 bytes --]

From f33af8dcfa5b46a50f8baef880c5cc52d2e64e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= <simenheg@gmail.com>
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--complete-bang-rule): New function for
completing a bang-rule.
(css-completion-at-point): Add support for completing bang-rules.
(scss-mode): Include Sass-specific completion rules.
---
 etc/NEWS                   |  4 ++--
 lisp/textmodes/css-mode.el | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index ce21532..e4fdfa7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -136,8 +136,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.
 
 \f
 * New Modes and Packages in Emacs 25.2
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index fd3459e..6c70759 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -732,6 +732,15 @@ css--complete-property
         (when (memq (char-before) '(?\{ ?\;))
           (list start pos css-property-ids))))))
 
+(defun css--complete-bang-rule (&optional sassy)
+  "Complete (optionally SASSY) CSS bang-rule at point."
+  (save-excursion
+    (let ((pos (point)))
+      (skip-chars-backward "-[:alnum:]")
+      (when (eq (char-before) ?\!)
+        (list (point) pos (append (if sassy scss-bang-ids)
+                                  css-bang-ids))))))
+
 (defun css--complete-pseudo-element-or-class ()
   "Complete pseudo-element or pseudo-class at point."
   (save-excursion
@@ -795,11 +804,13 @@ css--complete-property-value
           (list (point) end
                 (cons "inherit" (css--property-values property))))))))
 
-(defun css-completion-at-point ()
+(defun css-completion-at-point (&optional sassy)
   "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.
+SCSS-specific completions are included when SASSY is non-nil."
   (or (css--complete-property)
+      (css--complete-bang-rule sassy)
       (css--complete-property-value)
       (css--complete-pseudo-element-or-class)
       (css--complete-at-rule)))
@@ -958,7 +969,11 @@ 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 font-lock-defaults '(scss-font-lock-keywords nil t))
+  (remove-hook 'completion-at-point-functions
+               #'css-completion-at-point t)
+  (add-hook 'completion-at-point-functions
+            (lambda () (css-completion-at-point 'sassy)) nil 'local))
 
 (provide 'css-mode)
 ;;; css-mode.el ends here
-- 
2.8.0.rc3


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-31 19:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-28 12:52 bug#23135: [PATCH] Support completion of bang-rules in CSS mode Simen Heggestøyl
2016-03-28 15:16 ` Stefan Monnier
2016-03-30 16:33   ` Simen Heggestøyl
2016-03-30 21:06     ` Stefan Monnier
2016-03-31 19:23       ` Simen Heggestøyl

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).