From: "Simen Heggestøyl" <simenheg@gmail.com>
To: 23135@debbugs.gnu.org
Cc: Stefan Monnier <monnier@iro.umontreal.ca>
Subject: bug#23135: [PATCH] Support completion of bang-rules in CSS mode
Date: Mon, 28 Mar 2016 14:52:53 +0200 [thread overview]
Message-ID: <1459169573.32373.0@smtp.gmail.com> (raw)
[-- 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
next reply other threads:[~2016-03-28 12:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-28 12:52 Simen Heggestøyl [this message]
2016-03-28 15:16 ` bug#23135: [PATCH] Support completion of bang-rules in CSS mode 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459169573.32373.0@smtp.gmail.com \
--to=simenheg@gmail.com \
--cc=23135@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.