procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/smie.el (smie-indent-current-column): New fun

Browse source 
(smie-indent-exps, smie-indent-keyword): Use it.

* test/indent/css-mode.css: Test alignment with leading comment.
This commit is contained in:
Stefan Monnier 2015-08-21 14:13:05 -04:00
parent e967f17e5d
commit 74881b6e06
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lisp/emacs-lisp/smie.el
View file

@ -1198,6 +1198,21 @@ Comments are treated as spaces."
(forward-comment (- (point)))
(<= (point) bol))))
(defun smie-indent--current-column ()
"Like `current-column', but if there's a comment before us, use that."
;; This is used, so that when we align elements, we don't get
;; toto = { /* foo, */ a,
;; b }
;; but
;; toto = { /* foo, */ a,
;; b }
(let ((pos (point))
(lbp (line-beginning-position)))
(save-excursion
(unless (and (forward-comment -1) (>= (point) lbp))
(goto-char pos))
(current-column))))
;; Dynamically scoped.
(defvar smie--parent) (defvar smie--after) (defvar smie--token)
@ -1577,7 +1592,9 @@ should not be computed on the basis of the following token."
;; So we use a heuristic here, which is that we only use virtual
;; if the parent is tightly linked to the child token (they're
;; part of the same BNF rule).
(if (car parent) (current-column) (smie-indent-virtual)))))))))))
(if (car parent)
(smie-indent--current-column)
(smie-indent-virtual)))))))))))
(defun smie-indent-comment ()
"Compute indentation of a comment."
@ -1707,12 +1724,12 @@ should not be computed on the basis of the following token."
;; There's a previous element, and it's not special (it's not
;; the function), so let's just align with that one.
(goto-char (car positions))
(current-column))
(smie-indent--current-column))
((cdr positions)
;; We skipped some args plus the function and bumped into something.
;; Align with the first arg.
(goto-char (cadr positions))
(current-column))
(smie-indent--current-column))
(positions
;; We're the first arg.
(goto-char (car positions))
@ -1720,7 +1737,7 @@ should not be computed on the basis of the following token."
;; We used to use (smie-indent-virtual), but that
;; doesn't seem right since it might then indent args less than
;; the function itself.
(current-column)))))))
(smie-indent--current-column)))))))
(defvar smie-indent-functions
'(smie-indent-fixindent smie-indent-bob smie-indent-close

2
test/indent/css-mode.css
View file

@ -29,7 +29,7 @@ a.b:c,d.e:f,g[h]:i,j[k]:l,.m.n:o,.p.q:r,.s[t]:u,.v[w]:x { /* bug:20282 */
}
.x2
{
foo: bar;
/* foo: bar; */ foo2: bar2;
bar: baz;
}