Merge pull request #142 from vjeux/minimize_quotes

Minimize string escapes

src/printer.js

@@ -2059,7 +2059,18 @@ function swapQuotes(str) {
 function nodeStr(str, options) {
   isString.assert(str);
 
-  if (options.singleQuote) {
+  const containsSingleQuote = str.indexOf("'") !== -1;
+  const containsDoubleQuote = str.indexOf('"') !== -1;
+
+  let shouldUseSingleQuote = options.singleQuote;
+  if (options.singleQuote && containsSingleQuote && !containsDoubleQuote) {
+    shouldUseSingleQuote = false;
+  }
+  if (!options.singleQuote && !containsSingleQuote && containsDoubleQuote) {
+    shouldUseSingleQuote = true;
+  }
+
+  if (shouldUseSingleQuote) {
     return swapQuotes(JSON.stringify(swapQuotes(str)));
   } else {
     return JSON.stringify(str);

tests/node_tests/child_process/__snapshots__/jsfmt.spec.js.snap

@@ -164,9 +164,7 @@ var ls = child_process.spawn(\"ls\");
 var wc = child_process.spawn(\"wc\", [ \"-l\" ]);
 
 // args + options.
-child_process.spawn(\"echo\", [ \"-n\", \"\\\"Testing...\\\"\" ], {
-  env: { TEST: \"foo\" }
-});
+child_process.spawn(\"echo\", [ \"-n\", \'\"Testing...\"\' ], { env: { TEST: \"foo\" } });
 
 // options only.
 child_process.spawn(\"echo\", { env: { FOO: 2 } });

tests/strings/__snapshots__/jsfmt.spec.js.snap

@@ -26,9 +26,9 @@ exports[`test strings.js 1`] = `
 
 \"\'\";
 
-\"\\\"\";
-\"\\\"\";
-\"\\\\\\\"\";
+\'\"\';
+\'\"\';
+\'\\\\\"\';
 
 \"\'\";
 \"\'\";