Skip to content

Partially revert "Add regression test for NuschtOS/search#339 (#103)" #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Jun 20, 2026
Merged

Partially revert "Add regression test for NuschtOS/search#339 (#103)" #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 5 additions & 30 deletions libixx/src/string_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,52 +35,27 @@ impl Display for StringView<'_, '_> {
impl StringView<'_, '_> {
pub fn matches(&self, search: &[Vec<&[u8]>]) -> Result<bool, IxxError> {
let mut self_parts_start = 0;
// byte offset into self.parts[self_parts_start] to resume from
let mut self_parts_start_str_idx = 0;
// single-part matches leave self_parts_start on the matched label,
// a subsequent multi-part segment needs to start at the next label
let mut prev_was_single_part = false;

for segment in search {
// for eg: "programs.vim" each dot-component matches a full label exactly
if segment.len() > 1 {
if prev_was_single_part {
self_parts_start += 1;
self_parts_start_str_idx = 0;

prev_was_single_part = false;
}
for part in segment {
if self_parts_start >= self.parts.len() {
return Ok(false);
}
let self_part = self.index.resolve_reference(self.parts[self_parts_start])?;
if !eq_ignore_ascii_case(&self_part.data, part) {
return Ok(false);
}
self_parts_start += 1;
}
} else {
// bare word or trailing wildcard: substring should match across remaining labels
let part = &segment[0];
for part in segment {
'outer: {
for (self_part_idx, self_part) in self.parts[self_parts_start..].iter().enumerate() {
let self_part = self.index.resolve_reference(*self_part)?;

if let Some(idx) = ascii_ignore_case_find(&self_part.data[self_parts_start_str_idx..], part) {
self_parts_start += self_part_idx;
self_parts_start_str_idx = if self_part_idx == 0 {
self_parts_start_str_idx + idx
if self_part_idx == 0 {
self_parts_start_str_idx += idx;
} else {
idx
};
self_parts_start_str_idx = 0;
}
break 'outer;
}
self_parts_start_str_idx = 0;
}
return Ok(false);
}
prev_was_single_part = true;
}
}

Expand Down
27 changes: 0 additions & 27 deletions libixx/src/test/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,33 +103,6 @@ fn test_exact_search() {
vec![(1, 0, "programs.nixvim.enable".to_string())]
);

assert_eq!(
index.search(Some(0), "programs.vim", 10).unwrap(),
vec![(2, 0, "programs.vim.enable".to_string())]
);
assert_eq!(
index.search(Some(0), "programs.vim.enable", 10).unwrap(),
vec![(2, 0, "programs.vim.enable".to_string())]
);

// regression tests that wildcard matching also works as expected
assert_eq!(
index.search(Some(0), "programs.vim*", 10).unwrap(),
vec![(2, 0, "programs.vim.enable".to_string())]
);
assert_eq!(
index.search(Some(0), "programs.*vim.enable", 10).unwrap(),
vec![(2, 0, "programs.vim.enable".to_string())]
);
assert_eq!(
index.search(Some(0), "programs.neovim*", 10).unwrap(),
vec![(0, 0, "programs.neovim.enable".to_string())]
);
assert_eq!(
index.search(Some(0), "programs.nixvim*", 10).unwrap(),
vec![(1, 0, "programs.nixvim.enable".to_string())]
);

// regression test that no out of bounds happen
assert_eq!(
index.search(Some(0), "programs.vim.enable.extra", 10).unwrap(),
Expand Down
Loading