Fixed multiple issues due to not(:something) syntax

Fixed #618 Fixed #786 Fixed #952
beautifier · Aug 7, 2016 · 785e70d · 785e70d
1 parent 320171b
commit 785e70d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/js/lib/beautify-css.js b/js/lib/beautify-css.js
@@ -372,7 +372,8 @@
             } else if (ch === ":") {
                 eatWhitespace();
                 if ((insideRule || enteringConditionalGroup) &&
-                    !(lookBack("&") || foundNestedPseudoClass())) {
+                    !(lookBack("&") || foundNestedPseudoClass()) &&
+                    !lookBack("(")) {
                     // 'property: value' delimiter
                     // which could be in a conditional group query
                     insidePropertyValue = true;

diff --git a/js/test/generated/beautify-css-tests.js b/js/test/generated/beautify-css-tests.js
@@ -282,6 +282,15 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
             '\twidth: calc((100% - ((#{$items} - 1) * #{$margin}rem)) / #{$items});\n' +
             '\tmargin: 1.6rem #{$margin}rem 1.6rem 0;\n' +
             '}');
+
+        // Multiple filed issues in LESS due to not(:blah)
+        t('&:first-of-type:not(:last-child) {}');
+        t(
+            'div {\n' +
+            '\t&:not(:first-of-type) {\n' +
+            '\t\tbackground: red;\n' +
+            '\t}\n' +
+            '}');
 
 
         reset_options();

diff --git a/python/cssbeautifier/__init__.py b/python/cssbeautifier/__init__.py
@@ -51,7 +51,7 @@ def __repr__(self):
 newline_between_rules = [%s]
 space_around_selector_separator = [%s]
 """ % (self.indent_size, self.indent_char, self.indent_with_tabs,
-       self.selector_separator_newline, self.end_with_newline, self.newline_between_rules, 
+       self.selector_separator_newline, self.end_with_newline, self.newline_between_rules,
        self.space_around_selector_separator)
 
 
@@ -400,7 +400,8 @@ def beautify(self):
             elif self.ch == ":":
                 self.eatWhitespace()
                 if (insideRule or enteringConditionalGroup) and \
-                        not (self.lookBack('&') or self.foundNestedPseudoClass()):
+                        not (self.lookBack('&') or self.foundNestedPseudoClass()) and \
+                        not self.lookBack('('):
                     # 'property: value' delimiter
                     # which could be in a conditional group query
                     insidePropertyValue = True

diff --git a/python/cssbeautifier/tests/generated/tests.py b/python/cssbeautifier/tests/generated/tests.py
@@ -245,6 +245,15 @@ def testGenerated(self):
             '\twidth: calc((100% - ((#{$items} - 1) * #{$margin}rem)) / #{$items});\n' +
             '\tmargin: 1.6rem #{$margin}rem 1.6rem 0;\n' +
             '}')
+
+        # Multiple filed issues in LESS due to not(:blah)
+        t('&:first-of-type:not(:last-child) {}')
+        t(
+            'div {\n' +
+            '\t&:not(:first-of-type) {\n' +
+            '\t\tbackground: red;\n' +
+            '\t}\n' +
+            '}')
 
 
         self.reset_options();

diff --git a/test/data/css/tests.js b/test/data/css/tests.js
@@ -218,7 +218,21 @@ exports.test_data = {
                     '\tmargin: 1.6rem #{$margin}rem 1.6rem 0;',
                     '}'
                 ]
+            },
+            {
+                comment: "Multiple filed issues in LESS due to not(:blah)",
+                unchanged: '&:first-of-type:not(:last-child) {}'
+            },
+            {
+                unchanged: [
+                    'div {',
+                    '\t&:not(:first-of-type) {',
+                    '\t\tbackground: red;',
+                    '\t}',
+                    '}',
+                ]
             }
+
         ],
     }, {