Support a new CSS indentation style

* lisp/textmodes/css-mode.el (css-smie-rules): Indent after property
immediately followed by a newline.

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

* test/manual/indent/scss-mode.scss: Ditto.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 458ed9f8bb21b6f5dc53d0807129a009890dad69..45d750af755cd1347ccc874b50d14deb534ea8f7 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1208,7 +1208,10 @@ for determining whether point is within a selector."
        (smie-backward-sexp ";")
        (smie-indent-virtual)))
     (`(:before . ,(or "{" "("))
-     (if (smie-rule-hanging-p) (smie-rule-parent 0)))))
+     (if (smie-rule-hanging-p) (smie-rule-parent 0)))
+    (`(:after . ":-property")
+     (when (smie-rule-hanging-p)
+       css-indent-offset))))
 
 ;;; Completion
 

diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css
index 0845c02c299c8545bd8b70886163352389e4db81..79b082188f510ca123188530cfbaae8757b4b2bc 100644 (file)
--- a/test/manual/indent/css-mode.css
+++ b/test/manual/indent/css-mode.css
@@ -65,8 +65,15 @@ div::before {
         5.0, 6.0
     );
 }
+
 @font-face {
     src: url("Sans-Regular.eot") format("eot"),
          url("Sans-Regular.woff") format("woff"),
          url("Sans-Regular.ttf") format("truetype");
 }
+
+@font-face {
+    src:
+        url("Sans-Regular.eot") format("eot"),
+        url("Sans-Regular.woff") format("woff");
+}

diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss
index f9911ad11b77a95b7c1d460bb3b85afa5a2e5ff4..a3dd41eeb474cd1e23818b0e22b79885fbb5ad0e 100644 (file)
--- a/test/manual/indent/scss-mode.scss
+++ b/test/manual/indent/scss-mode.scss
@@ -92,3 +92,17 @@ div:last-child {
               "Nimbus Sans L", sans-serif;
     }
 }
+
+body {
+    font:
+        15px "Helvetica Neue", Helvetica, Arial,
+        "Nimbus Sans L", sans-serif;
+    font-family:
+        sans-serif;
+
+    article {
+        font:
+            15px "Helvetica Neue", Helvetica, Arial,
+            "Nimbus Sans L", sans-serif;
+    }
+}