From 3a6ae86fb67b4548334623180a25dce1ba9d82a9 Mon Sep 17 00:00:00 2001
From: Matt Furden <zolrath@gmail.com>
Date: Tue, 29 Nov 2022 23:49:53 -0800
Subject: [PATCH 1/3] Remove `firstRowIsWhiteSpace` - unused and breaks empty
 lines

The result of this value isn't used but it often fails when clicking on empty lines, resulting in gaps of highlighted text when there are new lines present.

Removing this line fixes this issue and removes an unused variable.
---
 webview/src/code.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webview/src/code.js b/webview/src/code.js
index d14dbcb..d180391 100644
--- a/webview/src/code.js
+++ b/webview/src/code.js
@@ -19,8 +19,6 @@ const setupLines = (node, config) => {
       
       // lineNumber click event
       lineNum.onclick = function (e) {
-        var firstRowIsWhiteSpace = this.nextSibling.firstChild.firstChild.innerText.trim() === "";
-
         if(this.parentNode.classList.contains("line-focus")) {
           
           this.parentNode.classList.remove("line-focus");

From c98945f8373bc59dd8ef989d60e26a5c21421516 Mon Sep 17 00:00:00 2001
From: Matt Furden <zolrath@gmail.com>
Date: Wed, 30 Nov 2022 13:22:09 -0800
Subject: [PATCH 2/3] Trim Empty Start/End Lines

It's quite easy to select the end of a line with no text, or an empty line at the start/end of the code you intend to screenshot.

This trims the resulting HTML of any blank lines at the start/end of the code, removing the need to reselect.
---
 webview/src/code.js | 60 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/webview/src/code.js b/webview/src/code.js
index d180391..504f280 100644
--- a/webview/src/code.js
+++ b/webview/src/code.js
@@ -2,12 +2,68 @@ import { $, $$, setVar, calcTextWidth } from './util.js';
 
 const snippetNode = $('#snippet');
 
+
+const trimLines = (rows) => {
+  // Trim blank lines from start/end
+  const totalLines = rows.length;
+  let trimStart = true;
+  let trimStartIndex = 0;
+
+  let trimEnd = false;
+  let trimEndIndex = 0;
+  let lastLineBlank = false;
+
+  for (let idx = 0; idx < totalLines; idx++) {
+    const lineIsEmpty = rows[idx].innerText.trim() === ""
+
+    // Keep track of how many lines at the start are blank.
+    if (trimStart) {
+      if (lineIsEmpty) {
+        trimStartIndex++;
+        continue;
+      } else {
+        trimStart = false;
+        trimEnd = true;
+      }
+    }
+
+    // Keep track of first blank line we encounter as we move towards the end
+    if (trimEnd) {
+      if (lineIsEmpty) {
+        if (!lastLineBlank) {
+          trimEndIndex = idx;
+          lastLineBlank = true;
+        }
+      } else {
+        trimEndIndex = totalLines;
+        lastLineBlank = false;
+      }
+    }
+  }
+
+  // Remove all the blank lines from the start
+  for (let idx = 0; idx < trimStartIndex; idx++) {
+    rows[idx].remove();
+  }
+
+  // Remove all the blank lines from the end
+  for (let idx = trimEndIndex; idx < totalLines; idx++) {
+    rows[idx].remove();
+  }
+
+
+  // Return the number of lines we removed so we can offset the line number.
+  return trimStartIndex;
+}
+
 const setupLines = (node, config) => {
   $$(':scope > br', node).forEach((row) => (row.outerHTML = '<div>&nbsp;</div>'));
 
   const rows = $$(':scope > div', node);
   setVar('line-number-width', calcTextWidth(rows.length + config.startLine));
 
+  const startLinesTrimmed = trimLines(rows);
+
   rows.forEach((row, idx) => {
     const newRow = document.createElement('div');
     newRow.classList.add('line');
@@ -45,7 +101,7 @@ const setupLines = (node, config) => {
           lineNum.classList.add('!text-white')
         }
       };
-      lineNum.textContent = idx + 1 + config.startLine;
+      lineNum.textContent = idx + 1 + config.startLine - startLinesTrimmed;
       newRow.appendChild(lineNum);
     }
 
@@ -57,7 +113,7 @@ const setupLines = (node, config) => {
     lineCodeDiv.classList.add('line-code');
 
     if (row.innerText.trim().length === 1 && row.childNodes.length === 2) {
-      var char = row.innerText.trim();
+      const char = row.innerText.trim();
 
       const lineCode = document.createElement('span');
       lineCode.innerHTML = row.innerHTML.split(char).join("");

From a9764f648608b8df6f48ea906a26c4242ac2dc54 Mon Sep 17 00:00:00 2001
From: Matt Furden <zolrath@gmail.com>
Date: Wed, 30 Nov 2022 15:28:54 -0800
Subject: [PATCH 3/3] Don't use blank lines in indent calculations

---
 webview/src/code.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webview/src/code.js b/webview/src/code.js
index 504f280..df746ba 100644
--- a/webview/src/code.js
+++ b/webview/src/code.js
@@ -133,8 +133,9 @@ const setupLines = (node, config) => {
 
 const stripInitialIndent = (node) => {
   const regIndent = /^\s+/u;
-  const initialSpans = $$(':scope > div > span:first-child', node);
+  let initialSpans = $$(':scope > div > span:first-child', node);
   if (initialSpans.some((span) => !regIndent.test(span.textContent))) return;
+  initialSpans = initialSpans.filter((span) => span.textContent.trim() === "");
   const minIndent = Math.min(
     ...initialSpans.map((span) => span.textContent.match(regIndent)[0].length)
   );