Remove fuzzy search changes remnant of development

Author: adamscott

core/string/fuzzy_search.cpp

@@ -162,7 +162,7 @@ void FuzzySearchResult::score_token_match(FuzzyTokenMatch &p_match, bool p_case_
 			substring_score *= 2;
 		}
 		// Score matches on a word boundary higher than matches within a word
-		if (_is_word_boundary(target.string, substring.x - 1) || _is_word_boundary(target.string, substring.x + substring.y)) {
+		if (_is_word_boundary(target, substring.x - 1) || _is_word_boundary(target, substring.x + substring.y)) {
 			substring_score += 4;
 		}
 		// Score exact query matches higher than non-compact subsequence matches
@@ -245,10 +245,10 @@ void FuzzySearch::sort_and_filter(Vector<FuzzySearchResult> &p_results) const {
 		bool operator()(const FuzzySearchResult &p_lhs, const FuzzySearchResult &p_rhs) const {
 			// Sort on (score, length, alphanumeric) to ensure consistent ordering.
 			if (p_lhs.score == p_rhs.score) {
-				if (p_lhs.target.string.length() == p_rhs.target.string.length()) {
-					return p_lhs.target.string < p_rhs.target.string;
+				if (p_lhs.target.length() == p_rhs.target.length()) {
+					return p_lhs.target < p_rhs.target;
 				}
-				return p_lhs.target.string.length() < p_rhs.target.string.length();
+				return p_lhs.target.length() < p_rhs.target.length();
 			}
 			return p_lhs.score > p_rhs.score;
 		}
@@ -293,16 +293,11 @@ void FuzzySearch::set_query(const String &p_query, bool p_case_sensitive) {
 }
 
 bool FuzzySearch::search(const String &p_target, FuzzySearchResult &p_result) const {
-	return search({ p_target, nullptr }, p_result);
-}
-
-bool FuzzySearch::search(const FuzzySearchTarget &p_target, FuzzySearchResult &p_result) const {
 	p_result.target = p_target;
-	const String &target_text = p_target.string;
-	p_result.dir_index = target_text.rfind_char('/');
+	p_result.dir_index = p_target.rfind_char('/');
 	p_result.miss_budget = max_misses;
 
-	String adjusted_target = case_sensitive ? target_text : target_text.to_lower();
+	String adjusted_target = case_sensitive ? p_target : p_target.to_lower();
 
 	// For each token, eagerly generate subsequences starting from index 0 and keep the best scoring one
 	// which does not conflict with prior token matches. This is not ensured to find the highest scoring
@@ -324,7 +319,7 @@ bool FuzzySearch::search(const FuzzySearchTarget &p_target, FuzzySearchResult &p
 				}
 			}
 			if (p_result.can_add_token_match(match)) {
-				p_result.score_token_match(match, match.is_case_insensitive(target_text, adjusted_target));
+				p_result.score_token_match(match, match.is_case_insensitive(p_target, adjusted_target));
 				if (best_match.token_idx == -1 || best_match.score < match.score) {
 					best_match = match;
 				}
@@ -348,16 +343,6 @@ bool FuzzySearch::search(const FuzzySearchTarget &p_target, FuzzySearchResult &p
 }
 
 void FuzzySearch::search_all(const PackedStringArray &p_targets, Vector<FuzzySearchResult> &p_results) const {
-	Vector<FuzzySearchTarget> targets;
-
-	for (const String &target : p_targets) {
-		targets.push_back({ target, nullptr });
-	}
-
-	search_all(targets, p_results);
-}
-
-void FuzzySearch::search_all(const Vector<FuzzySearchTarget> &p_targets, Vector<FuzzySearchResult> &p_results) const {
 	p_results.clear();
 
 	for (int i = 0; i < p_targets.size(); i++) {

core/string/fuzzy_search.h

@@ -62,11 +62,6 @@ class FuzzyTokenMatch {
 	Vector<Vector2i> substrings; // x is start index, y is length.
 };
 
-struct FuzzySearchTarget {
-	String string;
-	void *userdata;
-};
-
 class FuzzySearchResult {
 	friend class FuzzySearch;
 
@@ -79,7 +74,7 @@ class FuzzySearchResult {
 	void maybe_apply_score_bonus();
 
 public:
-	FuzzySearchTarget target;
+	String target;
 	int score = 0;
 	int original_index = -1;
 	int dir_index = -1;
@@ -101,7 +96,5 @@ class FuzzySearch {
 	void set_query(const String &p_query);
 	void set_query(const String &p_query, bool p_case_sensitive);
 	bool search(const String &p_target, FuzzySearchResult &p_result) const;
-	bool search(const FuzzySearchTarget &p_target, FuzzySearchResult &p_result) const;
 	void search_all(const PackedStringArray &p_targets, Vector<FuzzySearchResult> &p_results) const;
-	void search_all(const Vector<FuzzySearchTarget> &p_targets, Vector<FuzzySearchResult> &p_results) const;
 };

editor/gui/editor_quick_open_dialog.cpp

@@ -624,7 +624,7 @@ void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_cand
 }
 
 void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_candidate, const FuzzySearchResult &p_result) {
-	_setup_candidate(p_candidate, p_result.target.string);
+	_setup_candidate(p_candidate, p_result.target);
 	p_candidate.result = &p_result;
 }
 

tests/core/string/test_fuzzy_search.h

@@ -73,7 +73,7 @@ TEST_CASE("[FuzzySearch] Test fuzzy search results") {
 		search.set_query(test_case.query);
 		search.search_all(targets, results);
 		CHECK_GT(results.size(), 0);
-		CHECK_EQ(results[0].target.string, test_case.expected);
+		CHECK_EQ(results[0].target, test_case.expected);
 	}
 }