selection-count-view optional chaining

atom · Jul 17, 2020 · be21b5d · be21b5d
1 parent 2d08339
commit be21b5d
Showing 1 changed file with 15 additions and 39 deletions.
diff --git a/lib/selection-count-view.js b/lib/selection-count-view.js
@@ -29,39 +29,26 @@ export default class SelectionCountView {
 
   destroy() {
     this.activeItemSubscription.dispose();
-    if (this.selectionSubscription) {
-      this.selectionSubscription.dispose();
-    }
-    if (this.configSubscription) {
-      this.configSubscription.dispose();
-    }
+    this.selectionSubscription?.dispose();
+    this.configSubscription?.dispose();
     this.tooltipDisposable.dispose();
   }
 
   subscribeToConfig() {
-    if (this.configSubscription) {
-      this.configSubscription.dispose();
-    }
-    this.configSubscription = atom.config.observe(
-      'status-bar.selectionCountFormat',
-      value => {
-        this.formatString = value ? value : '(%L, %C)';
-        this.scheduleUpdateCount();
-      }
+    this.configSubscription?.dispose();
+    this.configSubscription = atom.config.observe('status-bar.selectionCountFormat',
+        value => {
+          this.formatString = value ? value : '(%L, %C)';
+          this.scheduleUpdateCount();
+        }
     );
   }
 
   subscribeToActiveTextEditor() {
-    if (this.selectionSubscription) {
-      this.selectionSubscription.dispose();
-    }
+    this.selectionSubscription?.dispose();
     const activeEditor = this.getActiveTextEditor();
-    const selectionsMarkerLayer = activeEditor
-      ? activeEditor.selectionsMarkerLayer
-      : undefined;
-    this.selectionSubscription = selectionsMarkerLayer
-      ? selectionsMarkerLayer.onDidUpdate(this.scheduleUpdateCount.bind(this))
-      : undefined;
+    const selectionsMarkerLayer = activeEditor?.selectionsMarkerLayer;
+    this.selectionSubscription = selectionsMarkerLayer?.onDidUpdate(this.scheduleUpdateCount.bind(this));
     this.scheduleUpdateCount();
   }
 
@@ -80,22 +67,11 @@ export default class SelectionCountView {
   }
 
   updateCount() {
-    // optional chaining rewritten:
-    let count, range;
     const editor = atom.workspace.getActiveTextEditor();
-    if (editor) {
-      count = editor.getSelectedText().length;
-      range = editor.getSelectedBufferRange();
-    }
-
-    let lineCount, rangeEndColumn;
-    if (range) {
-      lineCount = range.getRowCount();
-      rangeEndColumn = range.end.column;
-    }
-    if (rangeEndColumn === 0) {
-      lineCount -= 1;
-    }
+    const count = editor?.getSelectedText().length;
+    const range = editor?.getSelectedBufferRange();
+    let lineCount = range?.getRowCount();
+    if (range?.end.column === 0) { lineCount -= 1; }
     if (count > 0) {
       this.element.textContent = this.formatString
         .replace('%L', lineCount)