mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix indentation of multiline CSS property values

Browse source 
* lisp/textmodes/css-mode.el (css-smie-grammar): Give colons belonging
to properties higher precedence.
(css--colon-inside-selector-p, css--colon-inside-funcall): New
functions for helping SMIE during tokenization.
(css-smie--forward-token, css-smie--backward-token): Distinguish
colons belonging to properties from other colons.

* test/manual/indent/css-mode.css: Add tests for the changes above.

* test/manual/indent/scss-mode.scss: Ditto.
This commit is contained in:
Simen Heggestøyl 2017-02-02 20:05:32 +01:00
parent ff4dd0d39c
commit f6ff7bb1fc
3 changed files with 85 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lisp/textmodes/css-mode.el
View file

@ -32,10 +32,11 @@
;;; Code:
(require 'eww)
(require 'seq)
(require 'sgml-mode)
(require 'smie)
(require 'eww)
(require 'subr-x)
(defgroup css nil
"Cascading Style Sheets (CSS) editing mode."
@ -741,7 +742,30 @@ cannot be completed sensibly: `custom-ident',
(defconst css-smie-grammar
(smie-prec2->grammar
(smie-precs->prec2 '((assoc ";") (assoc ",") (left ":")))))
(smie-precs->prec2
'((assoc ";")
;; Colons that belong to a CSS property. These get a higher
;; precedence than other colons, such as colons in selectors,
;; which are represented by a plain ":" token.
(left ":-property")
(assoc ",")
(assoc ":")))))
(defun css--colon-inside-selector-p ()
"Return t if point looks to be inside a CSS selector.
This function is intended to be good enough to help SMIE during
tokenization, but should not be regarded as a reliable function
for determining wheter point is within a selector."
(save-excursion
(re-search-forward "[{};)]" nil t)
(eq (char-before) ?\{)))
(defun css--colon-inside-funcall ()
"Return t if point is inside a function call."
(when-let (opening-paren-pos (nth 1 (syntax-ppss)))
(save-excursion
(goto-char opening-paren-pos)
(eq (char-after) ?\())))
(defun css-smie--forward-token ()
(cond
@ -755,7 +779,13 @@ cannot be completed sensibly: `custom-ident',
";")
((progn (forward-comment (point-max))
(looking-at "[;,:]"))
(forward-char 1) (match-string 0))
(forward-char 1)
(if (equal (match-string 0) ":")
(if (or (css--colon-inside-selector-p)
(css--colon-inside-funcall))
":"
":-property")
(match-string 0)))
(t (smie-default-forward-token))))
(defun css-smie--backward-token ()
@ -766,7 +796,13 @@ cannot be completed sensibly: `custom-ident',
((and (eq (char-before) ?\}) (scss-smie--not-interpolation-p)
(> pos (point))) ";")
((memq (char-before) '(?\; ?\, ?\:))
(forward-char -1) (string (char-after)))
(forward-char -1)
(if (eq (char-after) ?\:)
(if (or (css--colon-inside-selector-p)
(css--colon-inside-funcall))
":"
":-property")
(string (char-after))))
(t (smie-default-backward-token)))))
(defun css-smie-rules (kind token)