fix: make drawToken a free function

Author: aminya

lib/mixins/canvas-drawer.js

@@ -434,56 +434,14 @@ export default class CanvasDrawer extends Mixin {
           ? this.getTokenColor(token)
           : this.getDefaultColor()
 
-        x = this.drawToken(
-          context, token.text, color, x, y, charWidth, charHeight
+        x = drawToken(
+          context, token.text, color, x, y, charWidth, charHeight, this.ignoreWhitespacesInTokens
         )
       }
     })
     context.fill()
   }
 
-  /**
-   * Draws a single token on the given context.
-   *
-   * @param  {CanvasRenderingContext2D} context the target canvas context
-   * @param  {string} text the token's text content
-   * @param  {string} color the token's CSS color
-   * @param  {number} x the x position of the token in the line
-   * @param  {number} y the y position of the line in the minimap
-   * @param  {number} charWidth the width of a character in the minimap
-   * @param  {number} charHeight the height of a character in the minimap
-   * @return {number} the x position at the end of the token
-   * @access private
-   */
-  drawToken (context, text, color, x, y, charWidth, charHeight) {
-    context.fillStyle = color
-
-    if (this.ignoreWhitespacesInTokens) {
-      const length = text.length * charWidth
-      context.fillRect(x, y, length, charHeight)
-
-      return x + length
-    } else {
-      let chars = 0
-      for (let j = 0, len = text.length; j < len; j++) {
-        const char = text[j]
-        if (/\s/.test(char)) {
-          if (chars > 0) {
-            context.fillRect(x - (chars * charWidth), y, chars * charWidth, charHeight)
-          }
-          chars = 0
-        } else {
-          chars++
-        }
-        x += charWidth
-      }
-      if (chars > 0) {
-        context.fillRect(x - (chars * charWidth), y, chars * charWidth, charHeight)
-      }
-      return x
-    }
-  }
-
   /**
    * Draws the specified decorations for the current `screenRow`.
    *
@@ -684,6 +642,49 @@ export default class CanvasDrawer extends Mixin {
 //    ##     ## ##    ##  ##     ## ##  ##  ##
 //    ########  ##     ## ##     ##  ###  ###
 
+/**
+ * Draws a single token on the given context.
+ *
+ * @param  {CanvasRenderingContext2D} context the target canvas context
+ * @param  {string} text the token's text content
+ * @param  {string} color the token's CSS color
+ * @param  {number} x the x position of the token in the line
+ * @param  {number} y the y position of the line in the minimap
+ * @param  {number} charWidth the width of a character in the minimap
+ * @param  {number} charHeight the height of a character in the minimap
+ * @return {number} the x position at the end of the token
+ * @return {boolean} the x position at the end of the token
+ * @access private
+ */
+function drawToken (context, text, color, x, y, charWidth, charHeight, ignoreWhitespacesInTokens) {
+  context.fillStyle = color
+
+  if (ignoreWhitespacesInTokens) {
+    const length = text.length * charWidth
+    context.fillRect(x, y, length, charHeight)
+
+    return x + length
+  } else {
+    let chars = 0
+    for (let j = 0, len = text.length; j < len; j++) {
+      const char = text[j]
+      if (/\s/.test(char)) {
+        if (chars > 0) {
+          context.fillRect(x - (chars * charWidth), y, chars * charWidth, charHeight)
+        }
+        chars = 0
+      } else {
+        chars++
+      }
+      x += charWidth
+    }
+    if (chars > 0) {
+      context.fillRect(x - (chars * charWidth), y, chars * charWidth, charHeight)
+    }
+    return x
+  }
+}
+
 /**
  * Returns an array of tokens by line.
  *