Fix merging of uncommitted filters

gorhill · gorhill · commit c8004c4b02e7 · 2026-01-10T12:38:27.000-05:00
Related issue: uBlockOrigin/uBlock-issues#3912
diff --git a/src/js/1p-filters.js b/src/js/1p-filters.js
@@ -197,7 +197,7 @@ function threeWayMerge(newContent) {
 
 /******************************************************************************/
 
-async function renderUserFilters(merge = false) {
+async function renderUserFilters() {
     const details = await vAPI.messaging.send('dashboard', {
         what: 'readUserFilters',
     });
@@ -208,15 +208,8 @@ async function renderUserFilters(merge = false) {
     qs$('#enableMyFilters input').checked = details.enabled;
     qs$('#trustMyFilters input').checked = details.trusted;
 
-    const newContent = details.content.trim();
-
-    if ( merge && self.hasUnsavedData() ) {
-        setEditorText(threeWayMerge(newContent));
-        userFiltersChanged({ changed: true });
-    } else {
-        setEditorText(newContent);
-        userFiltersChanged({ changed: false });
-    }
+    setEditorText(details.content.trim());
+    userFiltersChanged({ changed: false });
 
     rememberCurrentState();
 }
@@ -365,7 +358,13 @@ dom.on('#trustMyFilters input', 'change', userFiltersChanged);
             cmEditor.startOperation();
             const scroll = cmEditor.getScrollInfo();
             const selections = cmEditor.listSelections();
-            renderUserFilters(true).then(( ) => {
+            const shouldMerge = self.hasUnsavedData();
+            const beforeContent = getEditorText();
+            renderUserFilters().then(( ) => {
+                if ( shouldMerge ) {
+                    setEditorText(threeWayMerge(beforeContent));
+                    userFiltersChanged({ changed: true });
+                }
                 cmEditor.clearHistory();
                 cmEditor.setSelection(selections[0].anchor, selections[0].head);
                 cmEditor.scrollTo(scroll.left, scroll.top);
