imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: improved pattern editor task handling

Browse Source
This commit is contained in:
paxcut
2026-04-01 21:20:31 -07:00
parent 3a8f19cc90
commit 65aecd1c1e
4 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libimhex/source/api/task_manager.cpp
View File

@@ -332,6 +332,7 @@ namespace hex {
}
} catch (const Task::TaskInterruptor &) {
// Handle the task being interrupted by user request
log::debug("Task '{}' was interrupted", task->m_unlocalizedName.get());
task->interruption();
} catch (const std::exception &e) {
log::error("Exception in task '{}': {}", task->m_unlocalizedName.get(), e.what());

2
plugins/builtin/include/content/views/view_pattern_editor.hpp
View File

@@ -155,7 +155,7 @@ namespace hex::plugin::builtin {
PerProvider<std::list<EnvVar>> m_envVarEntries;
PerProvider<TaskHolder> m_analysisTask;
TaskHolder m_analysisTask;
PerProvider<bool> m_shouldAnalyze;
PerProvider<bool> m_breakpointHit;
PerProvider<bool> m_debuggerActive;

1
plugins/builtin/source/content/text_highlighting/pattern_language.cpp
View File

@@ -2515,7 +2515,6 @@ namespace hex::plugin::builtin {
m_viewPatternEditor->setChangesWereColored(!m_viewPatternEditor->interrupted());
};
try {
m_viewPatternEditor->incrementRunningHighlighters(1);
clearVariables();
if (!m_UDTs.empty())
m_UDTs.clear();

46
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -1402,29 +1402,33 @@ namespace hex::plugin::builtin {
*m_executionDone = true;
}
if (m_shouldAnalyze) {
m_shouldAnalyze = false;
if (m_shouldAnalyze.get(provider)) {
m_analysisTask = TaskManager::createBackgroundTask("hex.builtin.task.analyzing_data", [this, provider](Task &task) {
if (!m_suggestSupportedPatterns)
return;
if (m_analysisTask.isRunning())
m_analysisTask.interrupt();
else {
m_shouldAnalyze.get(provider) = false;
m_analysisTask = TaskManager::createBackgroundTask("hex.builtin.task.analyzing_data", [this, provider](Task &task) {
if (!m_suggestSupportedPatterns)
return;
auto foundPatterns = magic::findViablePatterns(provider, &task);
auto foundPatterns = magic::findViablePatterns(provider, &task);
if (!foundPatterns.empty()) {
std::scoped_lock lock(m_possiblePatternFilesMutex);
if (!foundPatterns.empty()) {
std::scoped_lock lock(m_possiblePatternFilesMutex);
auto &possiblePatterns = m_possiblePatternFiles.get(provider);
auto &possiblePatterns = m_possiblePatternFiles.get(provider);
possiblePatterns = std::move(foundPatterns);
possiblePatterns = std::move(foundPatterns);
if (m_autoApplyPatterns && possiblePatterns.size() == 1) {
loadPatternFile(possiblePatterns.front().patternFilePath, provider, false);
} else {
PopupAcceptPattern::open(this);
if (m_autoApplyPatterns && possiblePatterns.size() == 1) {
loadPatternFile(possiblePatterns.front().patternFilePath, provider, false);
} else {
PopupAcceptPattern::open(this);
}
}
}
});
});
}
}
{
@@ -1459,6 +1463,7 @@ namespace hex::plugin::builtin {
if (m_runAutomatically)
m_triggerAutoEvaluate = true;
});
m_runningParsers += 1;
m_hasUnevaluatedChanges.get(provider) = false;
}
@@ -1470,8 +1475,16 @@ namespace hex::plugin::builtin {
interrupt();
else if (m_runningHighlighters == 0 && m_changesWereParsed && !m_changesWereColored && !m_allStepsCompleted) {
m_textHighlighter.get(provider).setViewPatternEditor(this);
bool restoreInterruptState = false;
if (interrupted()) {
restoreInterruptState = true;
resetInterrupt();
}
m_textHighlighter.get(provider).updateRequiredInputs();
if (restoreInterruptState)
interrupt();
TaskManager::createBackgroundTask("HighlightSourceCode", [this,provider](auto &) { m_textHighlighter.get(provider).highlightSourceCode(); });
m_runningHighlighters += 1;
} else if (m_changesWereColored && !m_allStepsCompleted) {
m_textHighlighter.get(provider).setRequestedIdentifierColors();
m_allStepsCompleted = true;
@@ -1649,7 +1662,6 @@ namespace hex::plugin::builtin {
}
void ViewPatternEditor::parsePattern(const std::string &code, prv::Provider *provider) {
m_runningParsers += 1;
ContentRegistry::PatternLanguage::configureRuntime(*m_editorRuntime, nullptr);
const auto &ast = m_editorRuntime->parseString(code, pl::api::Source::DefaultSource);