fix: factor out renderData from updateBackDecorationsLayer

Author: aminya

lib/mixins/canvas-drawer.js

@@ -138,7 +138,17 @@ export default class CanvasDrawer extends Mixin {
 
     const decorations = this.minimap.decorationsByTypeThenRows(firstRow, lastRow)
 
-    this.updateBackDecorationsLayer(firstRow, lastRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations)
+    let renderData = {
+      context: this.backLayer.context,
+      canvasWidth,
+      canvasHeight,
+      lineHeight,
+      charWidth,
+      charHeight,
+      orders: Main.getPluginsOrder()
+    }
+
+    this.updateBackDecorationsLayer(firstRow, lastRow, renderData, lineHeight, editorElement, decorations)
     this.updateFrontDecorationsLayer(firstRow, lastRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations)
 
     this.pendingChanges = []
@@ -223,16 +233,13 @@ export default class CanvasDrawer extends Mixin {
    * @param  {number} firstRow firstRow the first row of the range to update
    * @param  {number} lastRow lastRow the last row of the range to update
    *
+   * @param {Object} renderData
    * @param {number} lineHeight  this.minimap.getLineHeight() * devicePixelRatio
-   * @param {number} charHeight  this.minimap.getCharHeight() * devicePixelRatio
-   * @param {number} charWidth  this.minimap.getCharWidth() * devicePixelRatio
-   * @param {number} canvasWidth  this.tokensLayer.getSize().width
-   * @param {number} canvasHeight  this.tokensLayer.getSize().height
    * @param {TextEditorElement} editorElement  this.minimap.getTextEditorElement()
    * @param {Array<Decoration>} decorations
    * @access private
    */
-  updateBackDecorationsLayer (firstRow, lastRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations) {
+  updateBackDecorationsLayer (firstRow, lastRow, renderData, lineHeight, editorElement, decorations) {
     const intactRanges = computeIntactRanges(firstRow, lastRow, this.pendingBackDecorationChanges, this.offscreenFirstRow, this.offscreenLastRow)
 
     // NOTE: this method is the hot function of Minimap. Do not refactor. The code is inlined delibarately.
@@ -242,7 +249,7 @@ export default class CanvasDrawer extends Mixin {
     this.backLayer.clearCanvas()
 
     if (intactRanges.length === 0) {
-      this.drawBackDecorationsForLines(firstRow, lastRow, 0, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations)
+      this.drawBackDecorationsForLines(firstRow, lastRow, 0, renderData, lineHeight, editorElement, decorations)
     } else {
       for (let j = 0, len = intactRanges.length; j < len; j++) {
         const intact = intactRanges[j]
@@ -258,12 +265,12 @@ export default class CanvasDrawer extends Mixin {
       for (let i = 0, len = intactRanges.length; i < len; i++) {
         const range = intactRanges[i]
 
-        this.drawBackDecorationsForLines(currentRow, range.start, currentRow - firstRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations)
+        this.drawBackDecorationsForLines(currentRow, range.start, currentRow - firstRow, renderData, lineHeight, editorElement, decorations)
 
         currentRow = range.end
       }
       if (currentRow <= lastRow) {
-        this.drawBackDecorationsForLines(currentRow, lastRow, currentRow - firstRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations)
+        this.drawBackDecorationsForLines(currentRow, lastRow, currentRow - firstRow, renderData, lineHeight, editorElement, decorations)
       }
     }
 
@@ -473,28 +480,15 @@ export default class CanvasDrawer extends Mixin {
    * @param  {number} offsetRow the relative offset to apply to rows when
    *                            rendering them
    *
+   * @param {Object} renderData
    * @param {number} lineHeight  this.minimap.getLineHeight() * devicePixelRatio
-   * @param {number} charHeight  this.minimap.getCharHeight() * devicePixelRatio
-   * @param {number} charWidth  this.minimap.getCharWidth() * devicePixelRatio
-   * @param {number} canvasWidth  this.tokensLayer.getSize().width
-   * @param {number} canvasHeight  this.tokensLayer.getSize().height
    * @param {TextEditorElement} editorElement  this.minimap.getTextEditorElement()
    * @param {Array<Decoration>} decorations
    * @access private
    */
-  drawBackDecorationsForLines (firstRow, lastRow, offsetRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations) {
+  drawBackDecorationsForLines (firstRow, lastRow, offsetRow, renderData, lineHeight, editorElement, decorations) {
     if (firstRow > lastRow) { return }
 
-    const renderData = {
-      context: this.backLayer.context,
-      canvasWidth,
-      canvasHeight,
-      lineHeight,
-      charWidth,
-      charHeight,
-      orders: Main.getPluginsOrder()
-    }
-
     const drawCustomDecorationLambda = (decoration, data, decorationColor) => drawCustomDecoration(decoration, data, decorationColor, editorElement)
     backgroundDecorationDispatcher['background-custom'] = drawCustomDecorationLambda
 
@@ -506,7 +500,7 @@ export default class CanvasDrawer extends Mixin {
       this.drawDecorations(screenRow, decorations, renderData, backgroundDecorationDispatcher, editorElement)
     }
 
-    this.backLayer.context.fill()
+    renderData.context.fill()
   }
 
   /**
@@ -532,16 +526,6 @@ export default class CanvasDrawer extends Mixin {
   drawFrontDecorationsForLines (firstRow, lastRow, offsetRow, lineHeight, charHeight, charWidth, canvasWidth, canvasHeight, editorElement, decorations) {
     if (firstRow > lastRow) { return }
 
-    const renderData = {
-      context: this.frontLayer.context,
-      canvasWidth,
-      canvasHeight,
-      lineHeight,
-      charWidth,
-      charHeight,
-      orders: Main.getPluginsOrder()
-    }
-
     const drawCustomDecorationLambda = (decoration, data, decorationColor) => drawCustomDecoration(decoration, data, decorationColor, editorElement)
     frontDecorationDispatcher['foreground-custom'] = drawCustomDecorationLambda