Split out the monster HighlightedAreaView file

Pulsar-Edit-Highlights · Mar 17, 2019 · e796c65 · e796c65
1 parent c01e77c
commit e796c65
Show file tree

Hide file tree

Showing 8 changed files with 242 additions and 199 deletions.
diff --git a/lib/highlight-selected.js b/lib/highlight-selected.js
@@ -1,5 +1,7 @@
 const { CompositeDisposable } = require('atom');
 const HighlightedAreaView = require('./highlighted-area-view');
+const ScrollMarkersService = require('./scroll-markers/scroll-markers-service');
+const StatusBarService = require('./status-bar/status-bar-service');
 
 module.exports = {
   config: {
@@ -79,14 +81,21 @@ module.exports = {
   },
 
   deactivate() {
-    if (this.areaView != null) {
+    if (this.areaView) {
       this.areaView.destroy();
     }
     this.areaView = null;
-    if (this.subscriptions != null) {
+    if (this.subscriptions) {
       this.subscriptions.dispose();
     }
     this.subscriptions = null;
+    if (this.scrollMarkersService) {
+      this.scrollMarkersService.destroy();
+    }
+    this.scrollMarkersService = null;
+    if (this.statusBarService) {
+      this.statusBarService = null;
+    }
   },
 
   provideHighlightSelectedV1Deprecated() {
@@ -98,7 +107,7 @@ module.exports = {
   },
 
   consumeStatusBar(statusBar) {
-    return this.areaView.setStatusBar(statusBar);
+    this.statusBarService = new StatusBarService(statusBar, this.areaView);
   },
 
   toggle() {
@@ -113,6 +122,6 @@ module.exports = {
   },
 
   consumeScrollMarker(scrollMarkerAPI) {
-    return this.areaView.setScrollMarker(scrollMarkerAPI);
+    this.scrollMarkersService = new ScrollMarkersService(this.areaView, scrollMarkerAPI);
   }
 };