Issue 5549 - Implement missing error handlings for custom filter lists

desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 644 matching lines @@
         sendMessageHandleErrors({
           type: "filters.importRaw",
           text: filters,
           removeExisting: true
         },
         (errors) =>
         {
           if (errors)
           {
             E("custom-filters").classList.add("warning");
+            const customFiltersError = clearAndGetCustomFiltersError();
+
             // The current error does not contain info about the line
             // that generated such error.
             // Whenever the error object will pass the bad filter
             // within its properties, this split should be removed.
-            const lines = filters.split(/\n+|\n\s+\n/);
+            const lines = filters.split("\n");
             const messages = errors.map(error => lines[error.lineno - 1]);
-            const editFilters = E("custom-filters-error");
             for (const message of messages)
             {
               const li = document.createElement("li");
-              editFilters.appendChild(li).textContent = message;

[saroyanm, 2018/01/30 12:03:44]

The Error keep being added to the error container.

+              customFiltersError.appendChild(li).textContent = message;
             }
             if (errors.length > 5)
-              editFilters.classList.add("many");
+              customFiltersError.classList.add("many");
           }
           else
           {
             setCustomFiltersView("read");
           }
         });
         break;
       case "show-more-filters-section":
         E("more-filters").setAttribute("aria-hidden", false);
         break;
@@ skipping 78 matching lines @@
           closeDialog();
         }
         else
         {
           form.querySelector(":invalid").focus();
         }
         break;
     }
   }
 
+  function clearAndGetCustomFiltersError()
+  {
+    const customFiltersError = E("custom-filters-error");
+    customFiltersError.textContent = "";
+    customFiltersError.classList.remove("many");
+    return customFiltersError;
+  }
+
   function setCustomFiltersView(mode)
   {
     let customFiltersElement = E("custom-filters-raw");
     updateCustomFiltersUi();
     if (mode == "read")
     {
       E("custom-filters").classList.remove("warning");
-      const editFilters = E("custom-filters-error");
-      editFilters.textContent = "";
-      editFilters.classList.remove("many");
+      clearAndGetCustomFiltersError();
       customFiltersElement.disabled = true;
       if (!customFiltersElement.value)
       {
         setCustomFiltersView("empty");
         return;
       }
     }
     else if (mode == "write")
     {
       customFiltersElement.disabled = false;
@@ skipping 384 matching lines @@
       special: true
     },
     (subscriptions) =>
     {
       // Load filters
       for (let subscription of subscriptions)
       {
         browser.runtime.sendMessage({
           type: "filters.get",
           subscriptionUrl: subscription.url
-        },
-        (filters) =>
-        {
-          loadCustomFilters(filters);
-        });
+        }, loadCustomFilters);
       }
     });
     loadRecommendations();
     browser.runtime.sendMessage({
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
     (url) =>
     {
       acceptableAdsUrl = url;
@@ skipping 293 matching lines @@
   });
   browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }