Fix two spacing issue in CSS

Author: bitwiseman

js/src/css/beautifier.js

@@ -400,7 +400,8 @@ Beautifier.prototype.beautify = function() {
         }
       }
     } else if (this._ch === '"' || this._ch === '\'') {
-      this.preserveSingleSpace(isAfterSpace);
+      var preserveQuoteSpace = previous_ch === '"' || previous_ch === '\'';
+      this.preserveSingleSpace(preserveQuoteSpace || isAfterSpace);
       this.print_string(this._ch + this.eatString(this._ch));
       this.eatWhitespace(true);
     } else if (this._ch === ';') {
@@ -507,7 +508,7 @@ Beautifier.prototype.beautify = function() {
         this._ch = '';
       }
     } else if (this._ch === '!' && !this._input.lookBack("\\")) { // !important
-      this.print_string(' ');
+      this._output.space_before_token = true;
       this.print_string(this._ch);
     } else {
       var preserveAfterSpace = previous_ch === '"' || previous_ch === '\'';

python/cssbeautifier/css/beautifier.py

@@ -422,7 +422,8 @@ def beautify(self):
                         # pseudo-element
                         self.print_string(":")
             elif self._ch == '"' or self._ch == "'":
-                self.preserveSingleSpace(isAfterSpace)
+                preserveQuoteSpace = previous_ch == '"' or previous_ch == "'"
+                self.preserveSingleSpace(preserveQuoteSpace or isAfterSpace)
                 self.print_string(self._ch + self.eatString(self._ch))
                 self.eatWhitespace(True)
             elif self._ch == ";":
@@ -537,7 +538,7 @@ def beautify(self):
                     self._ch = ""
             elif self._ch == "!" and not (self._input.lookBack("\\")):
                 # !important
-                self.print_string(" ")
+                self._output.space_before_token = True
                 self.print_string(self._ch)
             else:
                 preserveAfterSpace = previous_ch == '"' or previous_ch == "'"

test/data/css/tests.js

@@ -1502,6 +1502,31 @@ exports.test_data = {
           '    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);',
           '}'
         ]
+      }, {
+        comment: "#2056 - Extra space before !important added",
+        unchanged: [
+          '.x {',
+          '    $d: a !default;',
+          '}'
+        ]
+      }, {
+        unchanged: [
+          '.x {',
+          '    $d: a !default;',
+          '    @if $x !=0 {',
+          '        color: $var !important;',
+          '    }',
+          '}'
+        ]
+      }, {
+        comment: "#2051 - css format removes space after quoted value",
+        unchanged: [
+          'q {',
+          '    quotes: \\\'"\\\' \\\'"\\\' "\\\'" "\\\'";',
+          '    quotes: "some" \\\'thing\\\' "different";',
+          '    quotes: \\\'some\\\' "thing" \\\'different\\\';',
+          '}'
+        ]
       }]
     }, {
       name: "Regression tests - with default options",