feat(config): Added config options for the Prettier options 'useTabs'…

… and 'semi' Version 1.0 of Prettier added options to use tabs instead of spaces, and to remove semicolons at the end of lines. This adds the ability to change these options from the package settings pane.
prettier · Apr 14, 2017 · b920be7 · b920be7
1 parent defd1b5
commit b920be7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 10 deletions.
diff --git a/dist/config-schema.json b/dist/config-schema.json
@@ -84,26 +84,40 @@
         "default": true,
         "order": 2
       },
+      "semi": {
+        "title": "Semicolons",
+        "description": "Add semicolons at the end of lines.",
+        "type": "boolean",
+        "default": true,
+        "order": 3
+      },
+      "useTabs": {
+        "title": "Use Tabs",
+        "description": "Use tabs instead of spaces.",
+        "type": "boolean",
+        "default": false,
+        "order": 4
+      },
       "jsxBracketSameLine": {
         "title": "JSX Bracket Same Line",
         "description": "Put > on the same line in JSX.",
         "type": "boolean",
         "default": false,
-        "order": 3
+        "order": 5
       },
       "printWidth": {
         "title": "Print Width",
         "description": "Fit code within this line limit",
         "type": "integer",
         "default": 80,
-        "order": 4
+        "order": 6
       },
       "tabWidth": {
         "title": "Tab Width",
         "description": "Number of spaces to use per tab. Use 'auto' to use your editor's tab width setting.",
         "type": "string",
         "default": "auto",
-        "order": 5
+        "order": 7
       },
       "trailingComma": {
         "title": "Trailing Comma",
@@ -115,7 +129,7 @@
           "es5",
           "all"
         ],
-        "order": 6
+        "order": 8
       },
       "parser": {
         "title": "Parser",
@@ -126,7 +140,7 @@
           "babylon",
           "flow"
         ],
-        "order": 7
+        "order": 9
       }
     }
   },

diff --git a/dist/helpers.js b/dist/helpers.js
@@ -171,6 +171,8 @@ var getPrettierOptions = function getPrettierOptions(editor) {
     singleQuote: getPrettierOption('singleQuote'),
     trailingComma: getPrettierOption('trailingComma'),
     bracketSpacing: getPrettierOption('bracketSpacing'),
+    semi: getPrettierOption('semi'),
+    useTabs: getPrettierOption('useTabs'),
     jsxBracketSameLine: getPrettierOption('jsxBracketSameLine')
   };
 };

diff --git a/src/__snapshots__/helpers.test.js.snap b/src/__snapshots__/helpers.test.js.snap
@@ -12,8 +12,10 @@ Object {
   "jsxBracketSameLine": true,
   "parser": "flow",
   "printWidth": 80,
+  "semi": true,
   "singleQuote": true,
   "tabWidth": 2,
   "trailingComma": true,
+  "useTabs": true,
 }
 `;
diff --git a/src/config-schema.json b/src/config-schema.json
@@ -84,26 +84,40 @@
         "default": true,
         "order": 2
       },
+      "semi": {
+        "title": "Semicolons",
+        "description": "Add semicolons at the end of lines.",
+        "type": "boolean",
+        "default": true,
+        "order": 3
+      },
+      "useTabs": {
+        "title": "Use Tabs",
+        "description": "Use tabs instead of spaces.",
+        "type": "boolean",
+        "default": false,
+        "order": 4
+      },
       "jsxBracketSameLine": {
         "title": "JSX Bracket Same Line",
         "description": "Put > on the same line in JSX.",
         "type": "boolean",
         "default": false,
-        "order": 3
+        "order": 5
       },
       "printWidth": {
         "title": "Print Width",
         "description": "Fit code within this line limit",
         "type": "integer",
         "default": 80,
-        "order": 4
+        "order": 6
       },
       "tabWidth": {
         "title": "Tab Width",
         "description": "Number of spaces to use per tab. Use 'auto' to use your editor's tab width setting.",
         "type": "string",
         "default": "auto",
-        "order": 5
+        "order": 7
       },
       "trailingComma": {
         "title": "Trailing Comma",
@@ -115,7 +129,7 @@
           "es5",
           "all"
         ],
-        "order": 6
+        "order": 8
       },
       "parser": {
         "title": "Parser",
@@ -126,7 +140,7 @@
           "babylon",
           "flow"
         ],
-        "order": 7
+        "order": 9
       }
     }
   },

diff --git a/src/helpers.js b/src/helpers.js
@@ -127,6 +127,8 @@ const getPrettierOptions = (editor: TextEditor) => ({
   singleQuote: getPrettierOption('singleQuote'),
   trailingComma: getPrettierOption('trailingComma'),
   bracketSpacing: getPrettierOption('bracketSpacing'),
+  semi: getPrettierOption('semi'),
+  useTabs: getPrettierOption('useTabs'),
   jsxBracketSameLine: getPrettierOption('jsxBracketSameLine'),
 });
 

diff --git a/src/helpers.test.js b/src/helpers.test.js
@@ -324,6 +324,8 @@ describe('getPrettierOptions', () => {
         'prettier-atom.prettierOptions.singleQuote': true,
         'prettier-atom.prettierOptions.trailingComma': true,
         'prettier-atom.prettierOptions.bracketSpacing': true,
+        'prettier-atom.prettierOptions.semi': true,
+        'prettier-atom.prettierOptions.useTabs': true,
         'prettier-atom.prettierOptions.jsxBracketSameLine': true,
       }[option]);
     atom = { config: { get: mockGet } };
@@ -345,6 +347,8 @@ describe('getPrettierOptions', () => {
           'prettier-atom.prettierOptions.singleQuote': true,
           'prettier-atom.prettierOptions.trailingComma': true,
           'prettier-atom.prettierOptions.bracketSpacing': true,
+          'prettier-atom.prettierOptions.semi': true,
+          'prettier-atom.prettierOptions.useTabs': true,
           'prettier-atom.prettierOptions.jsxBracketSameLine': true,
         }[option]);
     atom = { config: { get: mockGet } };