Skip to content

Commit

Permalink
Revert "Adds fuzzy search for help search dialog"
Browse files Browse the repository at this point in the history
This reverts commit 481dbce.

Current fuzzy search implementation results in too many
non-useful results.

Could be re-added after result sort/filter/score functionality
is added. See godotengine#30072 for example existing implementation.

Fixes: godotengine#39128

Reverts: godotengine#32043

Fixed format style conflicts:
	editor/editor_help_search.cpp
  • Loading branch information
follower committed Jun 30, 2020
1 parent 2760576 commit 55d706c
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions editor/editor_help_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -332,17 +332,10 @@ bool EditorHelpSearch::Runner::_phase_match_classes() {
if (search_flags & SEARCH_METHODS) {
for (int i = 0; i < class_doc.methods.size(); i++) {
String method_name = (search_flags & SEARCH_CASE_SENSITIVE) ? class_doc.methods[i].name : class_doc.methods[i].name.to_lower();
String aux_term = (search_flags & SEARCH_CASE_SENSITIVE) ? term : term.to_lower();

if (aux_term.begins_with(".")) {
aux_term = aux_term.right(1);
}

if (aux_term.ends_with("(")) {
aux_term = aux_term.left(aux_term.length() - 1).strip_edges();
}

if (aux_term.is_subsequence_of(method_name)) {
if (method_name.find(term) > -1 ||
(term.begins_with(".") && method_name.begins_with(term.right(1))) ||
(term.ends_with("(") && method_name.ends_with(term.left(term.length() - 1).strip_edges())) ||
(term.begins_with(".") && term.ends_with("(") && method_name == term.substr(1, term.length() - 2).strip_edges())) {
match.methods.push_back(const_cast<DocData::MethodDoc *>(&class_doc.methods[i]));
}
}
Expand Down Expand Up @@ -448,9 +441,9 @@ bool EditorHelpSearch::Runner::_phase_select_match() {

bool EditorHelpSearch::Runner::_match_string(const String &p_term, const String &p_string) const {
if (search_flags & SEARCH_CASE_SENSITIVE) {
return p_term.is_subsequence_of(p_string);
return p_string.find(p_term) > -1;
} else {
return p_term.is_subsequence_ofi(p_string);
return p_string.findn(p_term) > -1;
}
}

Expand Down

0 comments on commit 55d706c

Please sign in to comment.