Issue 5159 - Expose collapse property for BlockingFilter

compiled/filter/RegExpFilter.cpp

 /*
  * 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 200 matching lines @@
       {
         data.mSitekeysStart = valueStart;
         data.mSitekeysEnd = valueEnd;
       }
     }
     else if (name.equals(u"match-case"_str))
       data.mMatchCase = !reverse;
     else if (name.equals(u"third-party"_str))
       data.mThirdParty = reverse ? TrippleState::NO : TrippleState::YES;
     else if (name.equals(u"collapse"_str))
-      data.mCollapse = reverse ? TrippleState::NO : TrippleState::YES;
+      data.mCollapse = reverse ? false : true;

[sergei, 2017/11/21 11:24:03]

I wonder whether it should be just `!reverse`.

[hub, 2017/11/21 15:15:20]

good point. Done.

     else
       error.reset(u"filter_unknown_option"_str);
   }
 
   void ParseOptions(String& text, DependentString& error, RegExpFilterData& data,
       String::size_type optionsStart)
   {
     data.mMatchCase = false;
     data.mThirdParty = TrippleState::ANY;
-    data.mCollapse = TrippleState::ANY;
+    data.mCollapse = true;
     data.mDomainsStart = String::npos;
     data.mSitekeysStart = String::npos;
     if (optionsStart >= text.length())
     {
       data.mContentType = defaultTypeMask;
       return;
     }
 
     data.mContentType = -1;
 
@@ skipping 146 matching lines @@
     return false;
   }
 
   if (!mData.RegExpParsingDone())
   {
     const OwnedString pattern(mData.GetRegExpSource(mText));
     mData.SetRegExp(GenerateRegExp(RegExpFromSource(pattern), mData.mMatchCase));
   }
   return TestRegExp(mData.mRegexpId, location);
 }