From 37ad821018a1a27a4a8ea00509901b7d212f17fe Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Wed, 26 May 2021 07:51:10 -0400
Subject: [PATCH] Fix loss of newlines when processing pre-parsing directives

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1603
---
 src/js/assets.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/js/assets.js b/src/js/assets.js
index 75804cdda..f63596efb 100644
--- a/src/js/assets.js
+++ b/src/js/assets.js
@@ -199,6 +199,14 @@ api.fetchText = async function(url) {
         if ( text.startsWith('<') && text.endsWith('>') ) {
             details.content = '';
         }
+
+        // Important: Non empty text resource must always end with a newline
+        if (
+            details.content.length !== 0 &&
+            details.content.endsWith('\n') === false
+        ) {
+            details.content += '\n';
+        }
     } catch(ex) {
         details = ex;
     }
@@ -218,7 +226,7 @@ api.fetchText = async function(url) {
 api.fetchFilterList = async function(mainlistURL) {
     const toParsedURL = url => {
         try {
-            return new URL(url);
+            return new URL(url.trim());
         } catch (ex) {
         }
     };
@@ -249,7 +257,7 @@ api.fetchFilterList = async function(mainlistURL) {
     //   `!#if` directive.
     const processIncludeDirectives = function(results) {
         const out = [];
-        const reInclude = /^!#include +(\S+)/gm;
+        const reInclude = /^!#include +(\S+)[^\n\r]*(?:[\n\r]+|$)/gm;
         for ( const result of results ) {
             if ( typeof result === 'string' ) {
                 out.push(result);
@@ -274,14 +282,14 @@ api.fetchFilterList = async function(mainlistURL) {
                     // Compute nested list path relative to parent list path
                     const pos = result.url.lastIndexOf('/');
                     if ( pos === -1 ) { continue; }
-                    const subURL = result.url.slice(0, pos + 1) + match[1];
+                    const subURL = result.url.slice(0, pos + 1) + match[1].trim();
                     if ( sublistURLs.has(subURL) ) { continue; }
                     sublistURLs.add(subURL);
                     out.push(
                         slice.slice(lastIndex, match.index + match[0].length),
-                        `! >>>>>>>> ${subURL}`,
+                        `! >>>>>>>> ${subURL}\n`,
                         api.fetchText(subURL),
-                        `! <<<<<<<< ${subURL}`
+                        `! <<<<<<<< ${subURL}\n`
                     );
                     lastIndex = reInclude.lastIndex;
                 }
@@ -316,7 +324,7 @@ api.fetchFilterList = async function(mainlistURL) {
         url: mainlistURL,
         content: allParts.length === 1
             ? allParts[0]
-            : allParts.map(s => s.trim()).filter(s => s !== '').join('\n') + '\n'
+            : allParts.join('') + '\n'
     };
 };