Merge branch 'master' into python-cssbeautifier

Conflicts:
	js/test/beautify-tests.js

Author: Daniel Stockman

js/lib/beautify-html.js

@@ -94,7 +94,8 @@
         options = options || {};
 
         // backwards compatibility to 1.3.4
-        if (options.wrap_line_length === undefined && options.max_char !== undefined) {
+        if ((options.wrap_line_length === undefined || parseInt(options.wrap_line_length, 10) === 0) &&
+                (options.max_char === undefined || parseInt(options.max_char, 10) === 0)) {
             options.wrap_line_length = options.max_char;
         }
 

js/lib/beautify.js

@@ -292,7 +292,7 @@
                 // Just continue formatting and the behavior should be logical.
                 // Also ignore unknown tokens.  Again, this should result in better behavior.
                 if (token_type !== 'TK_INLINE_COMMENT' && token_type !== 'TK_COMMENT' &&
-                    token_type !== 'TK_UNKNOWN') {
+                    token_type !== 'TK_BLOCK_COMMENT' && token_type !== 'TK_UNKNOWN') {
                     last_last_text = flags.last_text;
                     last_type = token_type;
                     flags.last_text = token_text;

js/lib/cli.js

@@ -116,6 +116,26 @@ var fs = require('fs'),
         // no shorthand for "config"
     });
 
+function verifyExists(fullPath) {
+    return fs.existsSync(fullPath) ? fullPath : null;
+}
+
+function findRecursive(dir, fileName) {
+    var fullPath = path.join(dir, fileName);
+    var nextDir = path.dirname(dir);
+    var result = verifyExists(fullPath);
+
+    if (!result && (nextDir !== dir)) {
+       result = findRecursive(nextDir, fileName);
+    }
+
+    return result;
+}
+
+function getUserHome() {
+    return process.env.HOME || process.env.USERPROFILE;
+}
+
 // var cli = require('js-beautify/cli'); cli.interpret();
 var interpret = exports.interpret = function(argv, slice) {
     var parsed = nopt(knownOpts, shortHands, argv, slice);
@@ -132,8 +152,8 @@ var interpret = exports.interpret = function(argv, slice) {
         parsed,
         cleanOptions(cc.env('jsbeautify_'), knownOpts),
         parsed.config,
-        cc.find('.jsbeautifyrc'),
-        cc.find(path.join(process.env.HOME || "", ".jsbeautifyrc")),
+        findRecursive(process.cwd(), '.jsbeautifyrc'),
+        verifyExists(path.join(getUserHome() || "", ".jsbeautifyrc")),
         __dirname + '/../config/defaults.json'
     ).snapshot;
 

js/test/beautify-tests.js

@@ -1689,6 +1689,37 @@ function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify,
         bth('<div class=\'{{#if thingIs \'value\'}}content{{/if}}\'></div>');
 
 
+        opts.wrap_line_length = 0;
+        //...---------1---------2---------3---------4---------5---------6---------7
+        //...1234567890123456789012345678901234567890123456789012345678901234567890
+        bth('<div>Some test text that should wrap_inside_this section here.</div>',
+            /* expected */
+            '<div>Some test text that should wrap_inside_this section here.</div>');
+
+        opts.wrap_line_length = "0";
+        //...---------1---------2---------3---------4---------5---------6---------7
+        //...1234567890123456789012345678901234567890123456789012345678901234567890
+        bth('<div>Some test text that should wrap_inside_this section here.</div>',
+            /* expected */
+            '<div>Some test text that should wrap_inside_this section here.</div>');
+
+        //BUGBUG: This should wrap before 40 not after.
+        opts.wrap_line_length = 40;
+        //...---------1---------2---------3---------4---------5---------6---------7
+        //...1234567890123456789012345678901234567890123456789012345678901234567890
+        bth('<div>Some test text that should wrap_inside_this section here.</div>',
+            /* expected */
+            '<div>Some test text that should wrap_inside_this\n' +
+            '    section here.</div>');
+
+       opts.wrap_line_length = "40";
+        //...---------1---------2---------3---------4---------5---------6---------7
+        //...1234567890123456789012345678901234567890123456789012345678901234567890
+        bth('<div>Some test text that should wrap_inside_this section here.</div>',
+            /* expected */
+            '<div>Some test text that should wrap_inside_this\n' +
+            '    section here.</div>');
+
         // css beautifier
         opts.indent_size = 1;
         opts.indent_char = '\t';

js/test/resources/example1.js

@@ -0,0 +1,3 @@
+function indentMe() {
+"no, me!";
+}

js/test/resources/indent11chars/.jsbeautifyrc

@@ -0,0 +1,6 @@
+{
+    "indent_size": 11,
+    "indent_char": " ",
+    "indent_level": 0,
+    "indent_with_tabs": false
+}

js/test/resources/indent11chars/subDir1/subDir2/empty.txt

@@ -88,6 +88,37 @@ test_cli_js_beautify()
       exit 1
   }
 
+  export HOME=
+  export USERPROFILE=
+  $CLI_SCRIPT -o /tmp/js-beautify-mkdir/example1-default.js $SCRIPT_DIR/resources/example1.js
+
+  cd $SCRIPT_DIR/resources/indent11chars
+  $CLI_SCRIPT /tmp/js-beautify-mkdir/example1-default.js | diff -q /tmp/js-beautify-mkdir/example1-default.js - && {
+      echo "js-beautify output for /tmp/js-beautify-mkdir/example1-default.js was expected to be different based on CWD settings."
+      exit 1
+  }
+  cd $SCRIPT_DIR/resources/indent11chars/subDir1/subDir2
+  $CLI_SCRIPT /tmp/js-beautify-mkdir/example1-default.js | diff -q /tmp/js-beautify-mkdir/example1-default.js - && {
+      echo "js-beautify output for /tmp/js-beautify-mkdir/example1-default.js was expected to be different based on CWD parent folder settings."
+      exit 1
+  }
+  cd $SCRIPT_DIR
+
+
+  export HOME=$SCRIPT_DIR/resources/indent11chars
+  $CLI_SCRIPT /tmp/js-beautify-mkdir/example1-default.js | diff -q /tmp/js-beautify-mkdir/example1-default.js - && {
+      echo "js-beautify output for /tmp/js-beautify-mkdir/example1-default.js was expected to be different based on HOME settings."
+      exit 1
+  }
+
+  export HOME=
+  export USERPROFILE=$SCRIPT_DIR/resources/indent11chars
+  $CLI_SCRIPT /tmp/js-beautify-mkdir/example1-default.js | diff -q /tmp/js-beautify-mkdir/example1-default.js - && {
+      echo "js-beautify output for /tmp/js-beautify-mkdir/example1-default.js was expected to be different based on USERPROFILE settings."
+      exit 1
+  }
+
+
 }
 
 test_cli_common css-beautify

js/test/shell-smoke-test.sh

@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "jsbeautifier.org for node",
   "main": "js/index.js",
   "preferGlobal": true,
@@ -47,6 +47,7 @@
     "nopt": "~2.1.1"
   },
   "devDependencies": {
-    "jshint": "1.1.0"
+    "jshint": "1.1.0",
+    "node-static": "~0.7.1"
   }
 }

package.json

@@ -329,7 +329,7 @@ def beautify(self, s, opts = None ):
 
             # The cleanest handling of inline comments is to treat them as though they aren't there.
             # Just continue formatting and the behavior should be logical.
-            if token_type != 'TK_INLINE_COMMENT' and token_type != 'TK_COMMENT' and token_type != 'TK_UNKNOWN':
+            if token_type != 'TK_INLINE_COMMENT' and token_type != 'TK_COMMENT' and token_type != 'TK_BLOCK_COMMENT' and token_type != 'TK_UNKNOWN':
                 self.last_last_text = self.flags.last_text
                 self.last_type = token_type
                 self.flags.last_text = self.token_text