imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault when opening recent file with pattern sync; Don't show p… (#2448)

Browse Source 
…attern selection popup when pattern is already open

This PR does two things. Most importantly, it fixes a segfault that can
be caused by opening a recent file with pattern sync enabled.
Secondly, it makes it so that the pattern selection popup does not
appear if you already have text in the pattern editor for a given
provider (due to CLI args, a project file, pattern sync, etc.). If you
open a file normally, that text field is empty and the popup will appear
so you can select a pre-made pattern like usual.
This commit is contained in:
Zackary Newman
2025-09-14 00:10:38 -04:00
committed by GitHub
parent f08b182bf2
commit 67efea6444
4 changed files with 110 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/ui/source/ui/text_editor/highlighter.cpp
View File

@@ -1,5 +1,6 @@
#include <ui/text_editor.hpp>
#include <hex/helpers/utils.hpp>
#include <hex/helpers/logger.hpp>
#include <algorithm>
namespace hex::ui {
@@ -50,8 +51,11 @@ namespace hex::ui {
std::smatch results;
std::string id;
if (m_languageDefinition.m_tokenize == nullptr)
if (m_languageDefinition.m_tokenize == nullptr) {
m_languageDefinition.m_tokenize = [](strConstIter, strConstIter, strConstIter &, strConstIter &, PaletteIndex &) { return false; };
log::warn("Syntax highlighting tokenize callback is nullptr");
return;
}
i32 linesSize = m_lines.size();
for (i32 i = 0; i < linesSize; ++i) {
auto &line = m_lines[i];
@@ -74,28 +78,11 @@ namespace hex::ui {
PaletteIndex token_color = PaletteIndex::Default;
bool hasTokenizeResult = m_languageDefinition.m_tokenize(current.m_charsIter, last.m_charsIter, token_begin, token_end, token_color);
auto token_offset = token_begin - first.m_charsIter;
if (!hasTokenizeResult) {
// todo : remove
// printf("using regex for %.*s\n", first + 10 < last ? 10 : i32(last - first), first);
for (auto &p: m_regexList) {
if (std::regex_search(first.m_charsIter, last.m_charsIter, results, p.first, std::regex_constants::match_continuous)) {
hasTokenizeResult = true;
const auto &v = results.begin();
token_begin = v->first;
token_end = v->second;
token_color = p.second;
break;
}
}
}
if (!hasTokenizeResult)
current = current + 1;
else {
auto token_offset = token_begin - first.m_charsIter;
current = first + token_offset;
u64 token_length = 0;
Line::Flags flags(0);
@@ -1181,4 +1168,4 @@ namespace hex::ui {
return false;
}
}
}