From 599b4311bb6be9204689a7725d37d6fdfca770aa Mon Sep 17 00:00:00 2001 From: James Long Date: Wed, 4 Jan 2017 17:32:05 -0500 Subject: [PATCH] Allow single quotes with --single-quotes option --- bin/jscodefmt | 15 ++++++--------- src/printer.js | 4 ---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/bin/jscodefmt b/bin/jscodefmt index 861c37d8..362acf9b 100755 --- a/bin/jscodefmt +++ b/bin/jscodefmt @@ -5,21 +5,18 @@ const minimist = require("minimist"); const jscodefmt = require("../index"); const argv = minimist(process.argv.slice(2), { - boolean: ["write", "useFlowParser", "bracket-spacing"] + boolean: ["write", "useFlowParser", "bracket-spacing", "single-quotes"] }); const filename = argv["_"][0]; -const printWidth = argv['print-width'] || 80; -const tabWidth = argv['tab-width'] || 2; -const useFlowParser = argv['flow-parser']; -const bracketSpacing = argv['bracket-spacing']; const write = argv['write']; const output = jscodefmt.format(fs.readFileSync(filename, "utf8"), { - printWidth, - tabWidth, - bracketSpacing, - useFlowParser + printWidth: argv['print-width'], + tabWidth: argv['tab-width'], + bracketSpacing: argv['bracket-spacing'], + useFlowParser: argv['flow-parser'], + quote: argv["single-quotes"] ? "single" : "double" }); if(write) { diff --git a/src/printer.js b/src/printer.js index 5b7a17e8..f645fb38 100644 --- a/src/printer.js +++ b/src/printer.js @@ -1993,10 +1993,6 @@ function nodeStr(str, options) { isString.assert(str); switch (options.quote) { - case "auto": - var double = JSON.stringify(str); - var single = swapQuotes(JSON.stringify(swapQuotes(str))); - return (double.length > single.length ? single : double); case "single": return swapQuotes(JSON.stringify(swapQuotes(str))); case "double":