fix: change the default values to match Prettier's defaults (#80)

* fix: Changed the default values to match Prettier's defaults Trailing commas, single quotes, and bracket spacing default values were incorrect and not matching Prettier's default values * test: Updated tests to correctly handle new default values
prettier · May 10, 2017 · fa37803 · fa37803
1 parent 34bcf55
commit fa37803
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/index.test.js b/src/index.test.js
@@ -120,8 +120,10 @@ const tests = [
   // go ahead and add a test case here
   {
     title: 'with code that needs no fixing',
-    input: {text: 'var [foo, {bar}] = window.APP;', eslintConfig: {rules: {}}},
-    output: 'var [foo, {bar}] = window.APP;',
+    input: {
+      text: 'var [foo, { bar }] = window.APP;', eslintConfig: {rules: {}},
+    },
+    output: 'var [foo, { bar }] = window.APP;',
   },
 ]
 
@@ -307,7 +309,7 @@ function noopOutput() {
   return `
     function foo() {
       // stuff
-      console.log('Hello world!', and, stuff);
+      console.log("Hello world!", and, stuff);
     }
   `
 }

diff --git a/src/utils.js b/src/utils.js
@@ -195,7 +195,7 @@ function getSingleQuote(eslintValue, fallbacks) {
     prettierValue = eslintValue
   }
 
-  return makePrettierOption('singleQuote', prettierValue, fallbacks, true)
+  return makePrettierOption('singleQuote', prettierValue, fallbacks, false)
 }
 
 function getTrailingComma(value, fallbacks, rules) {
@@ -212,7 +212,7 @@ function getTrailingComma(value, fallbacks, rules) {
     prettierValue = RULE_NOT_CONFIGURED
   }
 
-  return makePrettierOption('trailingComma', prettierValue, fallbacks, 'es5')
+  return makePrettierOption('trailingComma', prettierValue, fallbacks, 'none')
 }
 
 function getValFromTrailingCommaConfig(objectConfig) {
@@ -240,7 +240,7 @@ function getBracketSpacing(eslintValue, fallbacks) {
     prettierValue = eslintValue
   }
 
-  return makePrettierOption('bracketSpacing', prettierValue, fallbacks, false)
+  return makePrettierOption('bracketSpacing', prettierValue, fallbacks, true)
 }
 
 function getSemi(eslintValue, fallbacks) {

diff --git a/src/utils.test.js b/src/utils.test.js
@@ -100,6 +100,7 @@ const getPrettierOptionsFromESLintRulesTests = [
           functions: 'always-multiline',
         },
       ],
+      'object-curly-spacing': [2, 'never'],
     },
     options: {
       printWidth: 120,