Merge pull request #813 from mzivic7/fix_blank_line

Fix blank lines being ignored
atom-minimap · Oct 28, 2024 · 55460b3 · 55460b3
2 parents c0e2b55 + 56f1687
commit 55460b3
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,5 @@ npm-debug.log
 node_modules
 .live-archive
 pages
-dist
 .parcel-cache
-package-lock.json
+package-lock.json
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/dist/minimap-plugin-generator-element.68264bbd.js b/dist/minimap-plugin-generator-element.68264bbd.js
diff --git a/dist/minimap-plugin-generator-element.68264bbd.js.map b/dist/minimap-plugin-generator-element.68264bbd.js.map
diff --git a/dist/minimap-plugin-generator-element.f5282bf9.js b/dist/minimap-plugin-generator-element.f5282bf9.js
diff --git a/dist/minimap-plugin-generator-element.f5282bf9.js.map b/dist/minimap-plugin-generator-element.f5282bf9.js.map
diff --git a/lib/mixins/canvas-drawer.js b/lib/mixins/canvas-drawer.js
@@ -695,17 +695,19 @@ function drawLines(
     const editorTokensForScreenRow = editor.tokensForScreenRow(line)
     const numToken = editorTokensForScreenRow.length
     const numTokenToRender = Math.min(numToken, maxTokensInOneLine)
+
+    if (lastLine !== line) {
+      x = 0
+      y += lineHeight
+      lastLine = line
+      context.clearRect(x, y, canvasWidth, lineHeight)
+    }
+
     for (let iToken = 0; iToken < numTokenToRender; iToken++) {
       const token = editorTokensForScreenRow[iToken]
       const tokenText = token.text.replace(invisibleRegExp, " ")
       const tokenScopes = token.scopes
 
-      if (lastLine !== line) {
-        x = 0
-        y += lineHeight
-        lastLine = line
-        context.clearRect(x, y, canvasWidth, lineHeight)
-      }
       if (x > canvasWidth) {
         continue
       }

diff --git a/package.json b/package.json
@@ -89,7 +89,8 @@
         "fs-plus": false
       },
       "outputFormat": "commonjs",
-      "isLibrary": true
+      "isLibrary": true,
+      "optimize": true
     }
   },
   "viewProviders": [