Merge branch 'master' into io-move

beautifier · Sep 10, 2018 · 6469217 · 6469217
2 parents ee99c9b + 5aec460
commit 6469217
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/js/src/css/beautifier.js b/js/src/css/beautifier.js
@@ -373,7 +373,7 @@ Beautifier.prototype.beautify = function() {
         this.print_string(this._ch);
         this.eatWhitespace();
         this._ch = this._input.next();
-        if (this._ch === ')' || this._ch === '"' || this._ch !== '\'') {
+        if (this._ch === ')' || this._ch === '"' || this._ch === '\'') {
           this._input.back();
           parenLevel++;
         } else if (this._ch) {

diff --git a/js/test/generated/beautify-css-tests.js b/js/test/generated/beautify-css-tests.js
@@ -370,6 +370,30 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
             '\topacity: 0.9;\n' +
             '\tfilter: alpha(opacity=90);\n' +
             '}');
+
+        // simple data uri base64 test
+        t(
+            'a { background: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+            //  -- output --
+            'a {\n' +
+            '\tbackground: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n' +
+            '}');
+
+        // non-base64 data
+        t(
+            'a { background: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E); }',
+            //  -- output --
+            'a {\n' +
+            '\tbackground: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E);\n' +
+            '}');
+
+        // Beautifier does not fix or mitigate bad data uri
+        t(
+            'a { background: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+            //  -- output --
+            'a {\n' +
+            '\tbackground: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n' +
+            '}');
 
 
         //============================================================

diff --git a/python/cssbeautifier/tests/generated/tests.py b/python/cssbeautifier/tests/generated/tests.py
@@ -296,6 +296,30 @@ def testGenerated(self):
             '\topacity: 0.9;\n' +
             '\tfilter: alpha(opacity=90);\n' +
             '}')
+
+        # simple data uri base64 test
+        t(
+            'a { background: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+            #  -- output --
+            'a {\n' +
+            '\tbackground: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n' +
+            '}')
+
+        # non-base64 data
+        t(
+            'a { background: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E); }',
+            #  -- output --
+            'a {\n' +
+            '\tbackground: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E);\n' +
+            '}')
+
+        # Beautifier does not fix or mitigate bad data uri
+        t(
+            'a { background: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+            #  -- output --
+            'a {\n' +
+            '\tbackground: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n' +
+            '}')
 
 
         #============================================================

diff --git a/test/data/css/tests.js b/test/data/css/tests.js
@@ -165,6 +165,18 @@ exports.test_data = {
       tests: [{
         input: '#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity = 90);\n}',
         output: '#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity=90);\n}'
+      }, {
+        comment: 'simple data uri base64 test',
+        input: 'a { background: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+        output: 'a {\n\tbackground: url(data:image/gif;base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n}'
+      }, {
+        comment: 'non-base64 data',
+        input: 'a { background: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E); }',
+        output: 'a {\n\tbackground: url(data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E);\n}'
+      }, {
+        comment: 'Beautifier does not fix or mitigate bad data uri',
+        input: 'a { background: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=); }',
+        output: 'a {\n\tbackground: url(data:  image/gif   base64,R0lGODlhCwALAJEAAAAAAP///xUVFf///yH5BAEAAAMALAAAAAALAAsAAAIPnI+py+0/hJzz0IruwjsVADs=);\n}'
       }]
     }, {
       name: "Support simple language specific option inheritance/overriding",