js-beautify 1.5.6 → 1.5.10

package/js/lib/beautify.js

@@ -119,7 +119,7 @@
       // Matches a whole line break (where CRLF is considered a single
       // line break). Used to count lines.
 
-      var lineBreak = /\r\n|[\n\r\u2028\u2029]/g;
+      var lineBreak = exports.lineBreak = /\r\n|[\n\r\u2028\u2029]/g;
 
       // Test whether a given character code starts an identifier.
 
@@ -207,7 +207,6 @@
             'TK_OPERATOR': handle_operator,
             'TK_COMMA': handle_comma,
             'TK_BLOCK_COMMENT': handle_block_comment,
-            'TK_INLINE_COMMENT': handle_inline_comment,
             'TK_COMMENT': handle_comment,
             'TK_DOT': handle_dot,
             'TK_UNKNOWN': handle_unknown,
@@ -281,6 +280,8 @@
         opt.end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
         opt.comma_first = (options.comma_first === undefined) ? false : options.comma_first;
 
+        // For testing of beautify ignore:start directive
+        opt.test_output_raw = (options.test_output_raw === undefined) ? false : options.test_output_raw;
 
         // force opt.space_after_anon_function to true if opt.jslint_happy
         if(opt.jslint_happy) {
@@ -315,6 +316,9 @@
         last_last_text = ''; // pre-last token text
         output = new Output(indent_string, baseIndentString);
 
+        // If testing the ignore directive, start with output disable set to true
+        output.raw = opt.test_output_raw;
+
 
         // Stack of parsing/formatting states, including MODE.
         // We tokenize, parse, and output in an almost purely a forward-only stream of token input
@@ -359,7 +363,7 @@
             }
 
             if (opt.eol != '\n') {
-                sweet_code = sweet_code.replace(/[\r]?[\n]/mg, opt.eol);
+                sweet_code = sweet_code.replace(/[\n]/g, opt.eol);
             }
 
             return sweet_code;
@@ -456,6 +460,11 @@
         }
 
         function print_token(printable_token) {
+            if (output.raw) {
+                output.add_raw_token(current_token)
+                return;
+            }
+
             if (opt.comma_first && last_type === 'TK_COMMA'
                 && output.just_added_newline()) {
                 if(output.previous_line.last() === ',') {
@@ -1180,6 +1189,35 @@
         }
 
         function handle_block_comment() {
+            if (output.raw) {
+                output.add_raw_token(current_token)
+                if (current_token.directives && current_token.directives['preserve'] === 'end') {
+                    // If we're testing the raw output behavior, do not allow a directive to turn it off.
+                    if (!opt.test_output_raw) {
+                        output.raw = false;
+                    }
+                }
+                return;
+            }
+
+            if (current_token.directives) {
+                print_newline(false, true);
+                print_token();
+                if (current_token.directives['preserve'] === 'start') {
+                    output.raw = true;
+                }
+                print_newline(false, true);
+                return;
+            }
+
+            // inline block
+            if (!acorn.newline.test(current_token.text) && !current_token.wanted_newline) {
+                output.space_before_token = true;
+                print_token();
+                output.space_before_token = true;
+                return;
+            }
+
             var lines = split_newlines(current_token.text);
             var j; // iterator for this case
             var javadoc = false;
@@ -1218,12 +1256,6 @@
             print_newline(false, true);
         }
 
-        function handle_inline_comment() {
-            output.space_before_token = true;
-            print_token();
-            output.space_before_token = true;
-        }
-
         function handle_comment() {
             if (current_token.wanted_newline) {
                 print_newline(false, true);
@@ -1346,6 +1378,7 @@
         this.indent_cache = [ baseIndentString ];
         this.baseIndentLength = baseIndentString.length;
         this.indent_length = indent_string.length;
+        this.raw = false;
 
         var lines =[];
         this.baseIndentString = baseIndentString;
@@ -1354,6 +1387,16 @@
         this.current_line = null;
         this.space_before_token = false;
 
+        this.add_outputline = function() {
+            this.previous_line = this.current_line;
+            this.current_line = new OutputLine(this);
+            lines.push(this.current_line);
+        }
+
+        // initialize
+        this.add_outputline();
+
+
         this.get_line_number = function() {
             return lines.length;
         }
@@ -1365,18 +1408,15 @@
             }
 
             if (force_newline || !this.just_added_newline()) {
-                this.previous_line = this.current_line;
-                this.current_line = new OutputLine(this);
-                lines.push(this.current_line);
+                if (!this.raw) {
+                    this.add_outputline();
+                }
                 return true;
             }
 
             return false;
         }
 
-        // initialize
-        this.add_new_line(true);
-
         this.get_code = function() {
             var sweet_code = lines.join('\n').replace(/[\r\n\t ]+$/, '');
             return sweet_code;
@@ -1396,6 +1436,15 @@
             return false;
         }
 
+        this.add_raw_token = function(token) {
+            for (var x = 0; x < token.newlines; x++) {
+                this.add_outputline();
+            }
+            this.current_line.push(token.whitespace_before);
+            this.current_line.push(token.text);
+            this.space_before_token = false;
+        }
+
         this.add_token = function(printable_token) {
             this.add_space_before_token();
             this.current_line.push(printable_token);
@@ -1472,12 +1521,14 @@
         this.wanted_newline = newlines > 0;
         this.whitespace_before = whitespace_before || '';
         this.parent = null;
+        this.directives = null;
     }
 
     function tokenizer(input, opts, indent_string) {
 
         var whitespace = "\n\r\t ".split('');
         var digit = /[0-9]/;
+        var digit_hex = /[0123456789abcdefABCDEF]/;
 
         var punct = ('+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! ~ , : ? ^ ^= |= :: =>'
                 +' <%= <% %> <?= <? ?>').split(' '); // try to be a good boy and try not to break the markup language identifiers
@@ -1486,6 +1537,18 @@
         this.line_starters = 'continue,try,throw,return,var,let,const,if,switch,case,default,for,while,break,function,import,export'.split(',');
         var reserved_words = this.line_starters.concat(['do', 'in', 'else', 'get', 'set', 'new', 'catch', 'finally', 'typeof', 'yield', 'async', 'await']);
 
+        //  /* ... */ comment ends with nearest */ or end of file
+        var block_comment_pattern = /([\s\S]*?)((?:\*\/)|$)/g;
+
+        // comment ends just before nearest linefeed or end of file
+        var comment_pattern = /([^\n\r\u2028\u2029]*)/g;
+
+        var directives_block_pattern = /\/\* beautify( \w+[:]\w+)+ \*\//g;
+        var directive_pattern = / (\w+)[:](\w+)/g;
+        var directives_end_ignore_pattern = /([\s\S]*?)((?:\/\*\sbeautify\signore:end\s\*\/)|$)/g;
+
+        var template_pattern = /((<\?php|<\?=)[\s\S]*?\?>)|(<%[\s\S]*?%>)/g
+
         var n_newlines, whitespace_before_token, in_html_comment, tokens, parser_pos;
         var input_length;
 
@@ -1505,8 +1568,10 @@
             while (!(last && last.type === 'TK_EOF')) {
                 token_values = tokenize_next();
                 next = new Token(token_values[1], token_values[0], n_newlines, whitespace_before_token);
-                while(next.type === 'TK_INLINE_COMMENT' || next.type === 'TK_COMMENT' ||
-                    next.type === 'TK_BLOCK_COMMENT' || next.type === 'TK_UNKNOWN') {
+                while(next.type === 'TK_COMMENT' || next.type === 'TK_BLOCK_COMMENT' || next.type === 'TK_UNKNOWN') {
+                    if (next.type === 'TK_BLOCK_COMMENT') {
+                        next.directives = token_values[2];
+                    }
                     comments.push(next);
                     token_values = tokenize_next();
                     next = new Token(token_values[1], token_values[0], n_newlines, whitespace_before_token);
@@ -1537,6 +1602,23 @@
             return tokens;
         }
 
+        function get_directives (text) {
+            if (!text.match(directives_block_pattern)) {
+                return null;
+            }
+
+            var directives = {};
+            directive_pattern.lastIndex = 0;
+            var directive_match = directive_pattern.exec(text);
+
+            while (directive_match) {
+                directives[directive_match[1]] = directive_match[2];
+                directive_match = directive_pattern.exec(text);
+            }
+
+            return directives;
+        }
+
         function tokenize_next() {
             var i, resulting_string;
             var whitespace_on_this_line = [];
@@ -1562,15 +1644,13 @@
 
             while (in_array(c, whitespace)) {
 
-                if (c === '\n') {
-                    n_newlines += 1;
-                    whitespace_on_this_line = [];
-                } else if (n_newlines) {
-                    if (c === indent_string) {
-                        whitespace_on_this_line.push(indent_string);
-                    } else if (c !== '\r') {
-                        whitespace_on_this_line.push(' ');
+                if (acorn.newline.test(c)) {
+                    if (!(c === '\n' && input.charAt(parser_pos-2) === '\r')) {
+                        n_newlines += 1;
+                        whitespace_on_this_line = [];
                     }
+                } else {
+                    whitespace_on_this_line.push(c);
                 }
 
                 if (parser_pos >= input_length) {
@@ -1596,7 +1676,7 @@
                     allow_e = false;
                     c += input.charAt(parser_pos);
                     parser_pos += 1;
-                    local_digit = /[0123456789abcdefABCDEF]/
+                    local_digit = digit_hex
                 } else {
                     // we know this first loop will run.  It keeps the logic simpler.
                     c = '';
@@ -1677,39 +1757,29 @@
             if (c === '/') {
                 var comment = '';
                 // peek for comment /* ... */
-                var inline_comment = true;
                 if (input.charAt(parser_pos) === '*') {
                     parser_pos += 1;
-                    if (parser_pos < input_length) {
-                        while (parser_pos < input_length && !(input.charAt(parser_pos) === '*' && input.charAt(parser_pos + 1) && input.charAt(parser_pos + 1) === '/')) {
-                            c = input.charAt(parser_pos);
-                            comment += c;
-                            if (c === "\n" || c === "\r") {
-                                inline_comment = false;
-                            }
-                            parser_pos += 1;
-                            if (parser_pos >= input_length) {
-                                break;
-                            }
-                        }
-                    }
-                    parser_pos += 2;
-                    if (inline_comment && n_newlines === 0) {
-                        return ['/*' + comment + '*/', 'TK_INLINE_COMMENT'];
-                    } else {
-                        return ['/*' + comment + '*/', 'TK_BLOCK_COMMENT'];
+                    block_comment_pattern.lastIndex = parser_pos;
+                    var comment_match = block_comment_pattern.exec(input);
+                    comment = '/*' + comment_match[0];
+                    parser_pos += comment_match[0].length;
+                    var directives = get_directives(comment);
+                    if (directives && directives['ignore'] === 'start') {
+                        directives_end_ignore_pattern.lastIndex = parser_pos;
+                        comment_match = directives_end_ignore_pattern.exec(input)
+                        comment += comment_match[0];
+                        parser_pos += comment_match[0].length;
                     }
+                    comment = comment.replace(acorn.lineBreak, '\n');
+                    return [comment, 'TK_BLOCK_COMMENT', directives];
                 }
                 // peek for comment // ...
                 if (input.charAt(parser_pos) === '/') {
-                    comment = c;
-                    while (input.charAt(parser_pos) !== '\r' && input.charAt(parser_pos) !== '\n') {
-                        comment += input.charAt(parser_pos);
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            break;
-                        }
-                    }
+                    parser_pos += 1;
+                    comment_pattern.lastIndex = parser_pos;
+                    var comment_match = comment_pattern.exec(input);
+                    comment = '//' + comment_match[0];
+                    parser_pos += comment_match[0].length;
                     return [comment, 'TK_COMMENT'];
                 }
 
@@ -1784,6 +1854,7 @@
                         var xmlLength = match ? match.index + match[0].length : xmlStr.length;
                         xmlStr = xmlStr.slice(0, xmlLength);
                         parser_pos += xmlLength - 1;
+                        xmlStr = xmlStr.replace(acorn.lineBreak, '\n');
                         return [xmlStr, "TK_STRING"];
                     }
                 } else {
@@ -1795,11 +1866,14 @@
                     while (parser_pos < input_length &&
                             (esc || (input.charAt(parser_pos) !== sep &&
                             (sep === '`' || !acorn.newline.test(input.charAt(parser_pos)))))) {
-                        resulting_string += input.charAt(parser_pos);
                         // Handle \r\n linebreaks after escapes or in template strings
-                        if (input.charAt(parser_pos) === '\r' && input.charAt(parser_pos + 1) === '\n') {
-                            parser_pos += 1;
+                        if ((esc || sep === '`') && acorn.newline.test(input.charAt(parser_pos))) {
+                            if (input.charAt(parser_pos) === '\r' && input.charAt(parser_pos + 1) === '\n') {
+                                parser_pos += 1;
+                            }
                             resulting_string += '\n';
+                        } else {
+                            resulting_string += input.charAt(parser_pos);
                         }
                         if (esc) {
                             if (input.charAt(parser_pos) === 'x' || input.charAt(parser_pos) === 'u') {
@@ -1872,10 +1946,21 @@
                 }
             }
 
+            if (c === '<' && (input.charAt(parser_pos) === '?' || input.charAt(parser_pos) === '%')) {
+                template_pattern.lastIndex = parser_pos - 1;
+                var template_match = template_pattern.exec(input);
+                if(template_match) {
+                    c = template_match[0];
+                    parser_pos += c.length - 1;
+                    c = c.replace(acorn.lineBreak, '\n');
+                    return [c, 'TK_STRING'];
+                }
+            }
+
             if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
                 parser_pos += 3;
                 c = '<!--';
-                while (input.charAt(parser_pos) !== '\n' && parser_pos < input_length) {
+                while (!acorn.newline.test(input.charAt(parser_pos)) && parser_pos < input_length) {
                     c += input.charAt(parser_pos);
                     parser_pos++;
                 }

package/js/lib/cli.js

@@ -220,14 +220,15 @@ function usage(err) {
         '',
         'Beautifier Options:',
         '  -s, --indent-size             Indentation size [4]',
-        '  -c, --indent-char             Indentation character [" "]'
+        '  -c, --indent-char             Indentation character [" "]',
+        '  -t, --indent-with-tabs        Indent with tabs, overrides -s and -c',
+        '  -e, --eol                     Character(s) to use as line terminators. (default newline - "\\n")',
+        '  -n, --end-with-newline        End output with newline'
     ];
 
     switch (scriptName.split('-').shift()) {
         case "js":
             msg.push('  -l, --indent-level                Initial indentation level [0]');
-            msg.push('  -t, --indent-with-tabs            Indent with tabs, overrides -s and -c');
-            msg.push('  -e, --eol                         character(s) to use as line terminators. (default newline - "\\n")');
             msg.push('  -p, --preserve-newlines           Preserve line-breaks (--no-preserve-newlines disables)');
             msg.push('  -m, --max-preserve-newlines       Number of line-breaks to be preserved in one chunk [10]');
             msg.push('  -P, --space-in-paren              Add padding spaces within paren, ie. f( a, b )');
@@ -241,7 +242,6 @@ function usage(err) {
             msg.push('  -w, --wrap-line-length            Wrap lines at next opportunity after N characters [0]');
             msg.push('  -X, --e4x                         Pass E4X xml literals through untouched');
             msg.push('  --good-stuff                      Warm the cockles of Crockford\'s heart');
-            msg.push('  -n, --end-with-newline            End output with newline');
             msg.push('  -C, --comma-first                 Put commas at the beginning of new line instead of end');
             break;
         case "html":
@@ -254,7 +254,7 @@ function usage(err) {
             msg.push('  -p, --preserve-newlines           Preserve line-breaks (--no-preserve-newlines disables)');
             msg.push('  -m, --max-preserve-newlines       Number of line-breaks to be preserved in one chunk [10]');
             msg.push('  -U, --unformatted                 List of tags (defaults to inline) that should not be reformatted');
-            msg.push('  -E, --extra_liners            List of tags (defaults to [head,body,/html] that should have an extra newline');
+            msg.push('  -E, --extra_liners                List of tags (defaults to [head,body,/html] that should have an extra newline');
             break;
         case "css":
             msg.push('  -L, --selector-separator-newline        Add a newline between multiple selectors.')

package/js/test/beautify-css-tests.js

@@ -14,7 +14,7 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         break_chained_methods: false,
         selector_separator: '\n',
         end_with_newline: false,
-        newline_between_rules: true,
+        newline_between_rules: true
     };
 
     function test_css_beautifier(input)
@@ -35,6 +35,14 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         if (expected !== input) {
             sanitytest.expect(expected, expected);
         }
+
+        // Everywhere we do newlines, they should be replaced with opts.eol
+        opts.eol = '\r\\n';
+        expected = expected.replace(/[\n]/g, '\r\n');
+        sanitytest.expect(input, expected);
+        input = input.replace(/[\n]/g, '\r\n');
+        sanitytest.expect(input, expected);
+        opts.eol = '\n';
     }
 
     // test css
@@ -86,6 +94,42 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         // 
         t('#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity = 90);\n}', '#cboxOverlay {\n\tbackground: url(images/overlay.png) repeat 0 0;\n\topacity: 0.9;\n\tfilter: alpha(opacity=90);\n}');
 
+        // Selector Separator - (separator = " ", separator1 = " ")
+        opts.selector_separator_newline = false;
+        opts.selector_separator = " ";
+        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}');
+        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
+        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}');
+        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}');
+        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}');
+
+        // Selector Separator - (separator = " ", separator1 = " ")
+        opts.selector_separator_newline = false;
+        opts.selector_separator = "  ";
+        t('#bla, #foo{color:green}', '#bla, #foo {\n\tcolor: green\n}');
+        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
+        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab, .bat {}\n}');
+        t('#bla, #foo{color:black}', '#bla, #foo {\n\tcolor: black\n}');
+        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child, a:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}');
+
+        // Selector Separator - (separator = "\n", separator1 = "\n\t")
+        opts.selector_separator_newline = true;
+        opts.selector_separator = " ";
+        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}');
+        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
+        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}');
+        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}');
+        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}');
+
+        // Selector Separator - (separator = "\n", separator1 = "\n\t")
+        opts.selector_separator_newline = true;
+        opts.selector_separator = "  ";
+        t('#bla, #foo{color:green}', '#bla,\n#foo {\n\tcolor: green\n}');
+        t('@media print {.tab{}}', '@media print {\n\t.tab {}\n}');
+        t('@media print {.tab,.bat{}}', '@media print {\n\t.tab,\n\t.bat {}\n}');
+        t('#bla, #foo{color:black}', '#bla,\n#foo {\n\tcolor: black\n}');
+        t('a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}', 'a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child,\n\tdiv:hover {\n\t\tcolor: black;\n\t}\n}');
+
         // Newline Between Rules - (separator = "\n")
         opts.newline_between_rules = true;
         t('.div {}\n.span {}', '.div {}\n\n.span {}');
@@ -98,6 +142,7 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
         t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}', '@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}');
         t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
+        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n\n.div {\n\theight: 15px;\n}');
 
         // Newline Between Rules - (separator = "")
         opts.newline_between_rules = false;
@@ -111,6 +156,7 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div{height:15px;}', '@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: "Bitstream Vera Serif Bold";\n\t\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n\t}\n}\n.div {\n\theight: 15px;\n}');
         t('@font-face {\n\tfont-family: "Bitstream Vera Serif Bold";\n\tsrc: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: "Helvetica Neue"\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}');
         t('a:first-child{color:red;div:first-child{color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}');
+        t('a:first-child{color:red;div:not(.peq){color:black;}}\n.div{height:15px;}', 'a:first-child {\n\tcolor: red;\n\tdiv:not(.peq) {\n\t\tcolor: black;\n\t}\n}\n.div {\n\theight: 15px;\n}');
 
         // Functions braces
         t('.tabs(){}', '.tabs() {}');
@@ -148,6 +194,17 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t('@page:first {}', '@page: first {}');
         t('@page: first {}');
 
+        // SASS/SCSS
+        
+        // Basic Interpolation
+        t('p {\n\t$font-size: 12px;\n\t$line-height: 30px;\n\tfont: #{$font-size}/#{$line-height};\n}');
+        t('p.#{$name} {}');
+        t(
+            '@mixin itemPropertiesCoverItem($items, $margin) {\n' +
+            '\twidth: calc((100% - ((#{$items} - 1) * #{$margin}rem)) / #{$items});\n' +
+            '\tmargin: 1.6rem #{$margin}rem 1.6rem 0;\n' +
+            '}');
+
         // 
 
         // test basic css beautifier
@@ -231,9 +288,6 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         t("a:first-child{color:red;div:first-child{color:black;}}",
             "a:first-child {\n\tcolor: red;\n\tdiv:first-child {\n\t\tcolor: black;\n\t}\n}");
 
-        t("a:first-child,a:first-child{color:red;div:first-child,div:hover{color:black;}}",
-            "a:first-child,\na:first-child {\n\tcolor: red;\n\tdiv:first-child, div:hover {\n\t\tcolor: black;\n\t}\n}");
-
         // handle SASS/LESS parent reference
         t("div{&:first-letter {text-transform: uppercase;}}",
             "div {\n\t&:first-letter {\n\t\ttext-transform: uppercase;\n\t}\n}");
@@ -256,11 +310,6 @@ function run_css_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_bea
         opts.indent_char = ' ';
         opts.selector_separator_newline = false;
 
-        t("#bla, #foo{color:green}", "#bla, #foo {\n  color: green\n}");
-        t("@media print {.tab{}}", "@media print {\n  .tab {}\n}");
-        t("@media print {.tab,.bat{}}", "@media print {\n  .tab, .bat {}\n}");
-        t("#bla, #foo{color:black}", "#bla, #foo {\n  color: black\n}");
-
         // pseudo-classes and pseudo-elements
         t("#foo:hover {\n  background-image: url(foo@2x.png)\n}");
         t("#foo *:hover {\n  color: purple\n}");

package/js/test/beautify-html-tests.js

@@ -34,6 +34,14 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         if (expected !== input) {
             sanitytest.expect(expected, expected);
         }
+
+        // Everywhere we do newlines, they should be replaced with opts.eol
+        opts.eol = '\r\n';
+        expected = expected.replace(/[\n]/g, '\r\n');
+        sanitytest.expect(input, expected);
+        input = input.replace(/[\n]/g, '\r\n');
+        sanitytest.expect(input, expected);
+        opts.eol = '\n';
     }
 
     // test html
@@ -48,9 +56,6 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
         if (opts.indent_size === 4 && input) {
             wrapped_input = '<div>\n' + input.replace(/^(.+)$/mg, '    $1') + '\n    <span>inline</span>\n</div>';
             wrapped_expectation = '<div>\n' + expectation.replace(/^(.+)$/mg, '    $1') + '\n    <span>inline</span>\n</div>';
-            if (opts.end_with_newline) {
-                wrapped_expectation += '\n';
-            }
             test_fragment(wrapped_input, wrapped_expectation);
         }
     }
@@ -155,6 +160,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
 
         // Handlebars Indenting On - (content = "{{field}}")
         opts.indent_handlebars = true;
+        test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{field}}{{/if}}');
         test_fragment('{{#if 0}}\n{{/if}}');
@@ -209,6 +215,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
     
         // Handlebars Indenting On - (content = "{{! comment}}")
         opts.indent_handlebars = true;
+        test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{! comment}}{{/if}}');
         test_fragment('{{#if 0}}\n{{/if}}');
@@ -263,6 +270,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
     
         // Handlebars Indenting On - (content = "{pre{{field1}} {{field2}} {{field3}}post")
         opts.indent_handlebars = true;
+        test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{pre{{field1}} {{field2}} {{field3}}post{{/if}}');
         test_fragment('{{#if 0}}\n{{/if}}');
@@ -317,6 +325,7 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
     
         // Handlebars Indenting On - (content = "{{! \n mult-line\ncomment  \n     with spacing\n}}")
         opts.indent_handlebars = true;
+        test_fragment('{{page-title}}');
         test_fragment('{{#if 0}}{{/if}}');
         test_fragment('{{#if 0}}{{! \n mult-line\ncomment  \n     with spacing\n}}{{/if}}');
         test_fragment('{{#if 0}}\n{{/if}}');
@@ -386,6 +395,28 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
 
 
 
+        // Php formatting
+        test_fragment('<h1 class="content-page-header"><?=$view["name"]; ?></h1>');
+        test_fragment(
+            '<?php\n' +
+            'for($i = 1; $i <= 100; $i++;) {\n' +
+            '    #count to 100!\n' +
+            '    echo($i . "</br>");\n' +
+            '}\n' +
+            '?>');
+
+
+
+        // underscore.js  formatting
+        test_fragment(
+            '<div class="col-sm-9">\n' +
+            '    <textarea id="notes" class="form-control" rows="3">\n' +
+            '        <%= notes %>\n' +
+            '    </textarea>\n' +
+            '</div>');
+
+
+
         // Indent with tabs
         opts.indent_with_tabs = true;
         test_fragment(