Skip to content

Commit 1b747ff

Browse files
committed
add Sublime-like fuzzy search to file browser
1 parent 443c3fb commit 1b747ff

File tree

4 files changed

+96
-10
lines changed

4 files changed

+96
-10
lines changed

src/base/base_strings.c

+79
Original file line numberDiff line numberDiff line change
@@ -1658,6 +1658,85 @@ fuzzy_match_range_list_copy(Arena *arena, FuzzyMatchRangeList *src)
16581658
return dst;
16591659
}
16601660

1661+
internal ScoredFuzzyMatchRangeList
1662+
scored_fuzzy_match_find(Arena *arena, String8 needle, String8 haystack)
1663+
{
1664+
Temp scratch = scratch_begin(0, 0);
1665+
// We're going to implement a very simple scoring mechanism similar to that described in
1666+
// https://www.forrestthewoods.com/blog/reverse_engineering_sublime_texts_fuzzy_match/.
1667+
#define scored_fuzzy_match_unmatched -1
1668+
#define scored_fuzzy_match_consecutive 5
1669+
#define scored_fuzzy_match_unmatched_leading -3
1670+
ScoredFuzzyMatchRangeList invalid = {0};
1671+
ScoredFuzzyMatchRangeList result = {0};
1672+
// Simplify to a single needle which has common delimiters removed.
1673+
String8List needles = str8_split(scratch.arena, needle, (U8*)" ", 1, 0);
1674+
needle = str8_list_join(scratch.arena, &needles, 0);
1675+
if (needle.size == 0)
1676+
{
1677+
scratch_end(scratch);
1678+
return invalid;
1679+
}
1680+
String8 tmp_str = str8(needle.str, 1);
1681+
U64 find_pos = 0;
1682+
find_pos = str8_find_needle(haystack, find_pos, tmp_str, StringMatchFlag_CaseInsensitive);
1683+
if (find_pos >= haystack.size)
1684+
{
1685+
scratch_end(scratch);
1686+
return invalid;
1687+
}
1688+
// Leading character penalty.
1689+
// Only go to a max of 3 based on the article.
1690+
result.score += Min(find_pos, 3) * scored_fuzzy_match_unmatched_leading;
1691+
// We also want to deduct for additional unmatched characters between start and find_pos.
1692+
if (find_pos > 3)
1693+
{
1694+
result.score += (find_pos - 3) * scored_fuzzy_match_unmatched;
1695+
}
1696+
Rng1U64 range = r1u64(find_pos, find_pos + 1);
1697+
FuzzyMatchRangeNode *n = push_array(arena, FuzzyMatchRangeNode, 1);
1698+
n->range = range;
1699+
SLLQueuePush(result.list.first, result.list.last, n);
1700+
result.list.count += 1;
1701+
// Match the rest.
1702+
U64 prev_found = find_pos;
1703+
U64 search_start = 0;
1704+
find_pos += 1;
1705+
for (U64 idx = 1; idx < needle.size; ++idx)
1706+
{
1707+
tmp_str = str8(needle.str + idx, 1);
1708+
search_start = find_pos;
1709+
find_pos = str8_find_needle(haystack, find_pos, tmp_str, StringMatchFlag_CaseInsensitive);
1710+
if (find_pos >= haystack.size)
1711+
{
1712+
scratch_end(scratch);
1713+
return invalid;
1714+
}
1715+
// Compute consecutive bonus.
1716+
if (prev_found + 1 == find_pos)
1717+
{
1718+
result.score += scored_fuzzy_match_consecutive;
1719+
// We can reuse the existing node and simply extend it.
1720+
result.list.last->range.max = find_pos + 1;
1721+
}
1722+
else
1723+
{
1724+
result.score += (find_pos - search_start) * scored_fuzzy_match_unmatched;
1725+
Rng1U64 range = r1u64(find_pos, find_pos + 1);
1726+
FuzzyMatchRangeNode *n = push_array(arena, FuzzyMatchRangeNode, 1);
1727+
n->range = range;
1728+
SLLQueuePush(result.list.first, result.list.last, n);
1729+
result.list.count += 1;
1730+
}
1731+
prev_found = find_pos;
1732+
find_pos += 1;
1733+
}
1734+
// Compute final unmatched characters.
1735+
result.score += (haystack.size - find_pos) * scored_fuzzy_match_unmatched;
1736+
scratch_end(scratch);
1737+
return result;
1738+
}
1739+
16611740
////////////////////////////////
16621741
//~ NOTE(allen): Serialization Helpers
16631742

src/base/base_strings.h

+8
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ struct FuzzyMatchRangeList
148148
U64 total_dim;
149149
};
150150

151+
typedef struct ScoredFuzzyMatchRangeList ScoredFuzzyMatchRangeList;
152+
struct ScoredFuzzyMatchRangeList
153+
{
154+
FuzzyMatchRangeList list;
155+
S32 score;
156+
};
157+
151158
////////////////////////////////
152159
//~ rjf: Character Classification & Conversion Functions
153160

@@ -337,6 +344,7 @@ internal Vec4F32 rgba_from_hex_string_4f32(String8 hex_string);
337344

338345
internal FuzzyMatchRangeList fuzzy_match_find(Arena *arena, String8 needle, String8 haystack);
339346
internal FuzzyMatchRangeList fuzzy_match_range_list_copy(Arena *arena, FuzzyMatchRangeList *src);
347+
internal ScoredFuzzyMatchRangeList scored_fuzzy_match_find(Arena *arena, String8 needles, String8 haystack);
340348

341349
////////////////////////////////
342350
//~ NOTE(allen): Serialization Helpers

src/df/gfx/df_views.c

+8-9
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ df_qsort_compare_file_info__default(DF_FileInfo *a, DF_FileInfo *b)
2626
internal int
2727
df_qsort_compare_file_info__default_filtered(DF_FileInfo *a, DF_FileInfo *b)
2828
{
29-
int result = 0;
30-
if(a->filename.size < b->filename.size)
29+
if (a->match_ranges.score > b->match_ranges.score)
3130
{
32-
result = -1;
31+
return -1;
3332
}
34-
else if(a->filename.size > b->filename.size)
33+
if (a->match_ranges.score < b->match_ranges.score)
3534
{
36-
result = +1;
35+
return 1;
3736
}
38-
return result;
37+
return 0;
3938
}
4039

4140
internal int
@@ -2209,8 +2208,8 @@ DF_VIEW_UI_FUNCTION_DEF(FileSystem)
22092208
OS_FileIter *it = os_file_iter_begin(scratch.arena, path_query.path, 0);
22102209
for(OS_FileInfo info = {0}; os_file_iter_next(scratch.arena, it, &info);)
22112210
{
2212-
FuzzyMatchRangeList match_ranges = fuzzy_match_find(fs->cached_files_arena, path_query.search, info.name);
2213-
B32 fits_search = (path_query.search.size == 0 || match_ranges.count == match_ranges.needle_part_count);
2211+
ScoredFuzzyMatchRangeList match_ranges = scored_fuzzy_match_find(fs->cached_files_arena, path_query.search, info.name);
2212+
B32 fits_search = (path_query.search.size == 0 || match_ranges.list.count != 0);
22142213
B32 fits_dir_only = !!(info.props.flags & FilePropertyFlag_IsFolder) || !dir_selection;
22152214
if(fits_search && fits_dir_only)
22162215
{
@@ -2509,7 +2508,7 @@ DF_VIEW_UI_FUNCTION_DEF(FileSystem)
25092508
UI_PrefWidth(ui_pct(1, 0))
25102509
{
25112510
UI_Box *box = ui_build_box_from_stringf(UI_BoxFlag_DrawText, "%S##%p", file->filename, view);
2512-
ui_box_equip_fuzzy_match_ranges(box, &file->match_ranges);
2511+
ui_box_equip_fuzzy_match_ranges(box, &file->match_ranges.list);
25132512
}
25142513
}
25152514

src/df/gfx/df_views.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct DF_FileInfo
2222
{
2323
String8 filename;
2424
FileProperties props;
25-
FuzzyMatchRangeList match_ranges;
25+
ScoredFuzzyMatchRangeList match_ranges;
2626
};
2727

2828
typedef struct DF_FileInfoNode DF_FileInfoNode;

0 commit comments

Comments
 (0)