fix: call getTextEditorElement() outside of getDecorationColor

atom-minimap · Jan 2, 2021 · 739a561 · 739a561
1 parent ad4fa0e
commit 739a561
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/mixins/canvas-drawer.js b/lib/mixins/canvas-drawer.js
@@ -226,17 +226,18 @@ export default class CanvasDrawer extends Mixin {
    * its own `color` property.
    *
    * @param  {Decoration} decoration the decoration to get the color for
+   * @param {TextEditorElement} editorElement
    * @return {string} the CSS color for the provided decoration
    */
-  getDecorationColor (decoration) {
+  getDecorationColor (decoration, editorElement) {
     const properties = decoration.getProperties()
     if (properties.color) { return properties.color }
 
     if (properties.scope) {
       const scopeString = properties.scope.split(/\s+/)
-      return this.DOMStylesReader.retrieveStyleFromDom(scopeString, 'background-color', this.minimap.getTextEditorElement(), true)
+      return this.DOMStylesReader.retrieveStyleFromDom(scopeString, 'background-color', editorElement, true)
     } else {
-      return this.getDefaultColor(this.minimap.getTextEditorElement())
+      return this.getDefaultColor(editorElement)
     }
   }
 
@@ -499,7 +500,7 @@ export default class CanvasDrawer extends Mixin {
    * @access private
    */
   drawLineDecoration (decoration, data) {
-    data.context.fillStyle = this.getDecorationColor(decoration)
+    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
     data.context.fillRect(0, data.yRow, data.canvasWidth, data.lineHeight)
   }
 
@@ -511,7 +512,7 @@ export default class CanvasDrawer extends Mixin {
    * @access private
    */
   drawGutterDecoration (decoration, data) {
-    data.context.fillStyle = this.getDecorationColor(decoration)
+    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
     data.context.fillRect(0, data.yRow, 1, data.lineHeight)
   }
 
@@ -529,7 +530,7 @@ export default class CanvasDrawer extends Mixin {
     const range = decoration.getMarker().getScreenRange()
     const rowSpan = range.end.row - range.start.row
 
-    data.context.fillStyle = this.getDecorationColor(decoration)
+    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
 
     if (rowSpan === 0) {
       const colSpan = range.end.column - range.start.column
@@ -562,7 +563,7 @@ export default class CanvasDrawer extends Mixin {
     const yStart = data.yRow
     const yEnd = yStart + lineHeight
 
-    data.context.fillStyle = this.getDecorationColor(decoration)
+    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
 
     if (rowSpan === 0) {
       colSpan = range.end.column - range.start.column
@@ -638,7 +639,7 @@ export default class CanvasDrawer extends Mixin {
     const renderRoutine = decoration.getProperties().render
 
     if (renderRoutine) {
-      data.color = this.getDecorationColor(decoration)
+      data.color = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
       renderRoutine(decoration, data)
     }
   }