From ff330530123a9e3f6fbb2d0fe52564e4e3d78369 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Simen=20Heggest=C3=B8yl?= Date: Fri, 13 Oct 2017 21:48:12 +0200 Subject: [PATCH] Fix indentation bug in multi-line CSS selectors * lisp/textmodes/css-mode.el (css--colon-inside-selector-p): Fix indentation of multi-line CSS selectors that include both a pseudo-class and parenthesis. * test/manual/indent/css-mode.css: Add test for the above change. --- lisp/textmodes/css-mode.el | 2 +- test/manual/indent/css-mode.css | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 9022ab7c3fb..39885c10860 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1149,7 +1149,7 @@ This function is intended to be good enough to help SMIE during tokenization, but should not be regarded as a reliable function for determining whether point is within a selector." (save-excursion - (re-search-forward "[{};)]" nil t) + (re-search-forward "[{};]" nil t) (eq (char-before) ?\{))) (defun css--colon-inside-funcall () diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css index bf612b53a14..640418b022d 100644 --- a/test/manual/indent/css-mode.css +++ b/test/manual/indent/css-mode.css @@ -66,6 +66,16 @@ div::before { ); } +/* Multi-line selector including both a pseudo-class and + parenthesis. */ +.form-group:not(.required) label, +.birth-date .row > * { + &::after { + display: inline; + font-weight: normal; + } +} + @font-face { src: url("Sans-Regular.eot") format("eot"), url("Sans-Regular.woff") format("woff"), -- 2.39.5