logic: Fixed SearchMatch sorting not updated after rescoring

* also ignore template section in SearchMatch sorting

src/lib/data/search/SearchMatch.cpp

@@ -125,8 +125,19 @@ bool SearchMatch::operator<(const SearchMatch& other) const
 		otherStr = &other.name;
 	}
 
+	size_t size = getTextSizeForSorting(str);
+	size_t otherSize = other.getTextSizeForSorting(otherStr);
+
 	// text size
-	if (str->size() < otherStr->size())
+	if (size < otherSize)
+	{
+		return true;
+	}
+	else if (size > otherSize)
+	{
+		return false;
+	}
+	else if (str->size() < otherStr->size())
 	{
 		return true;
 	}
@@ -159,6 +170,18 @@ bool SearchMatch::operator<(const SearchMatch& other) const
 	return false;
 }
 
+size_t SearchMatch::getTextSizeForSorting(const std::string* str) const
+{
+	// check if templated symbol and only use size up to template stuff
+	size_t pos = str->find('<');
+	if (pos != std::string::npos)
+	{
+		return pos;
+	}
+
+	return str->size();
+}
+
 bool SearchMatch::isValid() const
 {
 	return searchType != SEARCH_NONE;

src/lib/data/search/SearchMatch.h

@@ -43,6 +43,8 @@ struct SearchMatch
 
 	bool operator<(const SearchMatch& other) const;
 
+	size_t getTextSizeForSorting(const std::string* str) const;
+
 	bool isValid() const;
 
 	void print(std::ostream& ostream) const;