feat(statusBar): Add an option to show/hide formatOnSave's state in t…

…he status bar Fixes #153
prettier · May 7, 2017 · 1abded3 · 1abded3
1 parent a4551df
commit 1abded3
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 30 deletions.
diff --git a/dist/config-schema.json b/dist/config-schema.json
@@ -32,6 +32,13 @@
         "default": true,
         "order": 2
       },
+      "showInStatusBar": {
+        "title": "Show in Status Bar",
+        "description": "Show in status bar if *Format on Save* is enabled or not.",
+        "type": "boolean",
+        "default": false,
+        "order": 3
+      },
       "scopes": {
         "title": "Scopes",
         "description": "Use `Editor: Log Cursor Scope` to determine the scopes for a file.",
@@ -48,7 +55,7 @@
         "items": {
           "type": "string"
         },
-        "order": 3
+        "order": 4
       },
       "excludedGlobs": {
         "title": "Exclude (list of globs)",

diff --git a/dist/main.js b/dist/main.js
@@ -20,6 +20,7 @@ var warnAboutLinterEslintFixOnSave = null;
 var displayDebugInfo = null;
 var toggleFormatOnSave = null;
 var subscriptions = null;
+var statusBarHandler = null;
 var statusBarTile = null;
 var tileElement = null;
 
@@ -65,6 +66,26 @@ var lazyToggleFormatOnSave = function lazyToggleFormatOnSave() {
   toggleFormatOnSave();
 };
 
+var attachStatusTile = function attachStatusTile() {
+  tileElement = createStatusTile();
+  statusBarTile = statusBarHandler.addLeftTile({
+    item: tileElement,
+    priority: 1000
+  });
+  updateStatusTile(subscriptions, tileElement);
+
+  subscriptions.add(atom.config.observe('prettier-atom.formatOnSaveOptions.enabled', function () {
+    return updateStatusTile(subscriptions, tileElement);
+  }));
+};
+
+var detachStatusTile = function detachStatusTile() {
+  disposeTooltip();
+  if (statusBarTile) {
+    statusBarTile.destroy();
+  }
+};
+
 // public API
 var activate = function activate() {
   subscriptions = new CompositeDisposable();
@@ -84,6 +105,9 @@ var activate = function activate() {
   subscriptions.add(atom.config.observe('prettier-atom.useEslint', function () {
     return lazyWarnAboutLinterEslintFixOnSave();
   }));
+  subscriptions.add(atom.config.observe('prettier-atom.formatOnSaveOptions.showInStatusBar', function (show) {
+    return show ? attachStatusTile() : detachStatusTile();
+  }));
 
   // HACK: an Atom bug seems to be causing old configuration settings to linger for some users
   //       https://github.com/jlongster/prettier-atom/issues/72
@@ -93,23 +117,16 @@ var activate = function activate() {
 
 var deactivate = function deactivate() {
   subscriptions.dispose();
-  disposeTooltip();
-  if (statusBarTile) {
-    statusBarTile.destroy();
-  }
+  detachStatusTile();
 };
 
 var consumeStatusBar = function consumeStatusBar(statusBar) {
-  tileElement = createStatusTile();
-  statusBarTile = statusBar.addLeftTile({
-    item: tileElement,
-    priority: 1000
-  });
-  updateStatusTile(subscriptions, tileElement);
+  statusBarHandler = statusBar;
 
-  subscriptions.add(atom.config.observe('prettier-atom.formatOnSaveOptions.enabled', function () {
-    return updateStatusTile(subscriptions, tileElement);
-  }));
+  var showInStatusBar = atom.config.get('prettier-atom.formatOnSaveOptions.showInStatusBar');
+  if (showInStatusBar) {
+    attachStatusTile();
+  }
 };
 
 module.exports = {

diff --git a/src/config-schema.json b/src/config-schema.json
@@ -32,6 +32,13 @@
         "default": true,
         "order": 2
       },
+      "showInStatusBar": {
+        "title": "Show in Status Bar",
+        "description": "Show in status bar if *Format on Save* is enabled or not.",
+        "type": "boolean",
+        "default": false,
+        "order": 3
+      },
       "scopes": {
         "title": "Scopes",
         "description": "Use `Editor: Log Cursor Scope` to determine the scopes for a file.",
@@ -48,7 +55,7 @@
         "items": {
           "type": "string"
         },
-        "order": 3
+        "order": 4
       },
       "excludedGlobs": {
         "title": "Exclude (list of globs)",

diff --git a/src/main.js b/src/main.js
@@ -10,6 +10,7 @@ let warnAboutLinterEslintFixOnSave = null;
 let displayDebugInfo = null;
 let toggleFormatOnSave = null;
 let subscriptions = null;
+let statusBarHandler = null;
 let statusBarTile = null;
 let tileElement = null;
 
@@ -55,6 +56,28 @@ const lazyToggleFormatOnSave = () => {
   toggleFormatOnSave();
 };
 
+const attachStatusTile = () => {
+  tileElement = createStatusTile();
+  statusBarTile = statusBarHandler.addLeftTile({
+    item: tileElement,
+    priority: 1000,
+  });
+  updateStatusTile(subscriptions, tileElement);
+
+  subscriptions.add(
+    atom.config.observe('prettier-atom.formatOnSaveOptions.enabled', () =>
+      updateStatusTile(subscriptions, tileElement),
+    ),
+  );
+};
+
+const detachStatusTile = () => {
+  disposeTooltip();
+  if (statusBarTile) {
+    statusBarTile.destroy();
+  }
+};
+
 // public API
 const activate = () => {
   subscriptions = new CompositeDisposable();
@@ -76,6 +99,12 @@ const activate = () => {
   subscriptions.add(
     atom.config.observe('prettier-atom.useEslint', () => lazyWarnAboutLinterEslintFixOnSave()),
   );
+  subscriptions.add(
+    atom.config.observe(
+      'prettier-atom.formatOnSaveOptions.showInStatusBar',
+      show => show ? attachStatusTile() : detachStatusTile(),
+    ),
+  );
 
   // HACK: an Atom bug seems to be causing old configuration settings to linger for some users
   //       https://github.com/jlongster/prettier-atom/issues/72
@@ -85,25 +114,16 @@ const activate = () => {
 
 const deactivate = () => {
   subscriptions.dispose();
-  disposeTooltip();
-  if (statusBarTile) {
-    statusBarTile.destroy();
-  }
+  detachStatusTile();
 };
 
 const consumeStatusBar = (statusBar) => {
-  tileElement = createStatusTile();
-  statusBarTile = statusBar.addLeftTile({
-    item: tileElement,
-    priority: 1000,
-  });
-  updateStatusTile(subscriptions, tileElement);
+  statusBarHandler = statusBar;
 
-  subscriptions.add(
-    atom.config.observe('prettier-atom.formatOnSaveOptions.enabled', () =>
-      updateStatusTile(subscriptions, tileElement),
-    ),
-  );
+  const showInStatusBar = atom.config.get('prettier-atom.formatOnSaveOptions.showInStatusBar');
+  if (showInStatusBar) {
+    attachStatusTile();
+  }
 };
 
 module.exports = {