diff options
| author | Simen Heggestøyl | 2018-01-27 18:03:49 +0100 |
|---|---|---|
| committer | Simen Heggestøyl | 2018-01-27 18:18:19 +0100 |
| commit | 26ee371d6dc7bd650db003a3bb62c11474373036 (patch) | |
| tree | d99e4dc7e323e6fdcc5548d7cad639f4c6d85419 | |
| parent | 848797ada4bc885e145bcace6a4b2cf4ed324216 (diff) | |
| download | emacs-26ee371d6dc7bd650db003a3bb62c11474373036.tar.gz emacs-26ee371d6dc7bd650db003a3bb62c11474373036.zip | |
Fix indentation bug with multi-line CSS values
* lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation of
multi-line CSS values that are separated by spaces.
* test/manual/indent/css-mode.css: Add a test case for the fix.
| -rw-r--r-- | lisp/textmodes/css-mode.el | 3 | ||||
| -rw-r--r-- | test/manual/indent/css-mode.css | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 7e997ac2c0f..6bd08f59190 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -1215,7 +1215,8 @@ for determining whether point is within a selector." | |||
| 1215 | (pcase (cons kind token) | 1215 | (pcase (cons kind token) |
| 1216 | (`(:elem . basic) css-indent-offset) | 1216 | (`(:elem . basic) css-indent-offset) |
| 1217 | (`(:elem . arg) 0) | 1217 | (`(:elem . arg) 0) |
| 1218 | (`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467). | 1218 | ;; "" stands for BOB (bug#15467). |
| 1219 | (`(:list-intro . ,(or `";" `"" `":-property")) t) | ||
| 1219 | (`(:before . "{") | 1220 | (`(:before . "{") |
| 1220 | (when (or (smie-rule-hanging-p) (smie-rule-bolp)) | 1221 | (when (or (smie-rule-hanging-p) (smie-rule-bolp)) |
| 1221 | (smie-backward-sexp ";") | 1222 | (smie-backward-sexp ";") |
diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css index 640418b022d..ecf6c3c0ca5 100644 --- a/test/manual/indent/css-mode.css +++ b/test/manual/indent/css-mode.css | |||
| @@ -56,6 +56,8 @@ div::before { | |||
| 56 | sans-serif; | 56 | sans-serif; |
| 57 | font: 15px "Helvetica Neue", Helvetica, Arial, | 57 | font: 15px "Helvetica Neue", Helvetica, Arial, |
| 58 | "Nimbus Sans L", sans-serif; | 58 | "Nimbus Sans L", sans-serif; |
| 59 | background: no-repeat right | ||
| 60 | 5px center; | ||
| 59 | transform: matrix(1.0, 2.0, | 61 | transform: matrix(1.0, 2.0, |
| 60 | 3.0, 4.0, | 62 | 3.0, 4.0, |
| 61 | 5.0, 6.0); | 63 | 5.0, 6.0); |