Merge pull request #798 from atom-minimap/stylesreader

Author: aminya

babel.config.json

@@ -24,11 +24,13 @@ export function dasherize(string) {
 }
 
 export function debounce(callback, wait) {
-  let timeoutId = null
+  let timeoutId
   return (...args) => {
-    clearTimeout(timeoutId)
+    if (timeoutId !== undefined) {
+      clearTimeout(timeoutId)
+    }
     timeoutId = setTimeout(() => {
-      callback.apply(null, args)
+      callback(...args)
     }, wait)
   }
 }

lib/adapters/legacy-adapter.js

@@ -3,13 +3,13 @@
 import { Emitter, CompositeDisposable } from "atom"
 import MinimapElement from "./minimap-element"
 import Minimap from "./minimap"
-import config from "./config.json"
+import * as config from "./config.json"
 import * as PluginManagement from "./plugin-management"
 import { treeSitterWarning } from "./performance-monitor"
-import DOMStylesReader from "./dom-styles-reader"
+import { StyleReader } from "atom-ide-base/commons-ui/dom-style-reader"
 import { debounce } from "./deps/underscore-plus"
 
-export { default as config } from "./config.json"
+export * as config from "./config.json"
 export * from "./plugin-management"
 export { default as Minimap } from "./minimap"
 export { default as MinimapElement } from "./minimap-element"
@@ -65,8 +65,8 @@ let subscriptionsOfCommands = null
  */
 export const emitter = new Emitter()
 
-/** DOMStylesReader cache used for storing token colors */
-export let domStylesReader = null
+/** StyleReader cache used for storing token colors */
+export let styleReader = null
 
 /** Activates the minimap package. */
 export function activate() {
@@ -90,7 +90,7 @@ export function activate() {
   })
 
   editorsMinimaps = new Map()
-  domStylesReader = new DOMStylesReader()
+  styleReader = new StyleReader()
 
   subscriptions = new CompositeDisposable()
   active = true
@@ -134,7 +134,7 @@ export function deactivate() {
 
   subscriptions.dispose()
   subscriptionsOfCommands.dispose()
-  domStylesReader.invalidateDOMStylesCache()
+  styleReader.invalidateDOMStylesCache()
   toggled = false
   active = false
 }
@@ -171,7 +171,7 @@ export function toggle() {
     toggled = true
     initSubscriptions()
   }
-  domStylesReader.invalidateDOMStylesCache()
+  styleReader.invalidateDOMStylesCache()
 }
 
 /**
@@ -398,7 +398,7 @@ function initSubscriptions() {
 
 /** Force update styles of minimap */
 function updateStyles() {
-  domStylesReader.invalidateDOMStylesCache()
+  styleReader.invalidateDOMStylesCache()
   editorsMinimaps.forEach((minimap) => {
     atom.views.getView(minimap).requestForcedUpdate()
   })

lib/deps/underscore-plus.js

@@ -211,13 +211,6 @@ export default class Minimap {
 
     if (atom.views.getView(this.textEditor).getScrollTop != null) {
       this.adapter = new StableAdapter(this.textEditor)
-    } else {
-      // TODO remove LegacyAdapter in the next major version
-      atom.notifications.addWarning(
-        "LegacyAdapter of Minimap is deprecated and will be removed in the next major version. Please upgrade Atom to the latest version."
-      )
-      const LegacyAdapter = require("./adapters/legacy-adapter")
-      this.adapter = new LegacyAdapter(this.textEditor)
     }
 
     /**