Skip to content

Escape search term when not using Regex expression in global search #1669

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Escape search term when not using Regex expression in global search #1669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49fa849
Escape search term when no using Regex expression
jeremypw Nov 10, 2025
f6cebfa
Remove badges earlier
jeremypw Nov 10, 2025
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
9 changes: 6 additions & 3 deletions src/FolderManager/ProjectFolderItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ namespace Scratch.FolderManager {
var wholeword_search = Scratch.settings.get_boolean ("wholeword-search");
var case_mode = (CaseSensitiveMode)(Scratch.settings.get_enum ("case-sensitive-search"));
var use_regex = Scratch.settings.get_boolean ("regex-search");

switch (case_mode) {
case NEVER:
case_sensitive = false;
Expand Down Expand Up @@ -568,13 +569,18 @@ namespace Scratch.FolderManager {
dialog.run ();

if (search_term != null) {
// Remove results of previous search before attempting a new one
remove_all_badges ();
collapse_all ();

/* Put search term in search bar to help user locate the position of the matches in each doc */
var search_variant = new Variant.string (search_term);
var app = (Gtk.Application)GLib.Application.get_default ();
var win = (Scratch.MainWindow)(app.get_active_window ());
win.actions.lookup_action ("action-find").activate (search_variant);

if (!use_regex) {
search_term = Regex.escape_string (search_term);
if (wholeword_search) {
search_term = "\\b%s\\b".printf (search_term);
}
Expand Down Expand Up @@ -608,9 +614,6 @@ namespace Scratch.FolderManager {
path_spec
);

remove_all_badges ();
collapse_all ();

if (monitored_repo != null && !is_explicit) {
try {
monitored_repo.git_repo.file_status_foreach (status_options, (rel_path, status) => {
Expand Down