From ec6575db000f4034ca4a556a87e9d496cf963425 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 11 May 2022 14:21:16 +0200
Subject: [PATCH] Avoid the `preprocess`-function adding consecutive blank
 lines

When pre-processor blocks are being removed, since they don't apply to the current build target, we may currently end up with consecutive blank lines.
While this is obviously not a big issue, it's nonetheless undesirable and we can adjust the `writeLine` function to prevent that.
---
 external/builder/builder.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/external/builder/builder.js b/external/builder/builder.js
index e13ad8b27..d63d7e637 100644
--- a/external/builder/builder.js
+++ b/external/builder/builder.js
@@ -4,6 +4,8 @@ const fs = require("fs"),
   path = require("path"),
   vm = require("vm");
 
+const AllWhitespaceRegexp = /^\s+$/g;
+
 /**
  * A simple preprocessor that is based on the Firefox preprocessor
  * (https://dxr.mozilla.org/mozilla-central/source/build/docs/preprocessor.rst).
@@ -69,6 +71,12 @@ function preprocess(inFilename, outFilename, defines) {
     typeof outFilename === "function"
       ? outFilename
       : function (line) {
+          if (!line || AllWhitespaceRegexp.test(line)) {
+            const prevLine = out[out.length - 1];
+            if (!prevLine || AllWhitespaceRegexp.test(prevLine)) {
+              return; // Avoid adding consecutive blank lines.
+            }
+          }
           out.push(line);
         };
   function evaluateCondition(code) {