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

improv: refactor text editor to follow imhex style. (#2382)

Browse Source 
Also fixes two bugs:
1) error messages not staying visible
2) uncaught exception when struct name is duplicated.

A lot of the code using coordinates for start and end has been moved to
use Selections instead. Created more string manipulation code that uses
utf8 indices aka Coordinates directly. This makes implementing editing
functions easier by not having to go back and forth from string indices
to char indices and back. Currently, the substring, erase and []
operator support coordinates and str indices.
This commit is contained in:
paxcut
2025-08-06 01:01:07 -07:00
committed by GitHub
parent 750f91dbbc
commit d429424f67
8 changed files with 2272 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,7 +292,8 @@ namespace hex::plugin::builtin {
if (identifierType == identifierTypeToSearch) {
switch (identifierType) {
case IdentifierType::Function:
getTokenRange({tkn::Keyword::Function}, m_functionTokenRange, m_namespaceTokenRange, false, &m_functionBlocks);
if (!m_functionTokenRange.contains(name))
getTokenRange({tkn::Keyword::Function}, m_functionTokenRange, m_namespaceTokenRange, false, &m_functionBlocks);
break;
case IdentifierType::NameSpace:
if (std::ranges::find(m_nameSpaces, name) == m_nameSpaces.end())
@@ -300,7 +301,8 @@ namespace hex::plugin::builtin {
getTokenRange({tkn::Keyword::Namespace}, m_functionTokenRange, m_namespaceTokenRange, true, nullptr);
break;
case IdentifierType::UDT:
getTokenRange({tkn::Keyword::Struct, tkn::Keyword::Union, tkn::Keyword::Enum, tkn::Keyword::Bitfield}, m_UDTTokenRange, m_namespaceTokenRange, false, &m_UDTBlocks);
if (!m_UDTTokenRange.contains(name))
getTokenRange({tkn::Keyword::Struct, tkn::Keyword::Union, tkn::Keyword::Enum, tkn::Keyword::Bitfield}, m_UDTTokenRange, m_namespaceTokenRange, false, &m_UDTBlocks);
break;
case IdentifierType::Attribute:
linkAttribute();
@@ -1250,7 +1252,7 @@ namespace hex::plugin::builtin {
}
}
}
m_viewPatternEditor->getTextEditor().SetErrorMarkers(errorMarkers);
m_viewPatternEditor->getTextEditor().setErrorMarkers(errorMarkers);
}
// creates a map from variable names to a vector of token indices
@@ -1588,7 +1590,7 @@ namespace hex::plugin::builtin {
lineOfColors[tokenOffset + j] = color;
}
}
m_viewPatternEditor->getTextEditor().SetColorizedLine(line, lineOfColors);
m_viewPatternEditor->getTextEditor().setColorizedLine(line, lineOfColors);
}
}
@@ -1917,7 +1919,7 @@ namespace hex::plugin::builtin {
m_lines.clear();
if (m_text.empty())
m_text = m_viewPatternEditor->getTextEditor().GetText();
m_text = m_viewPatternEditor->getTextEditor().getText();
m_lines = wolv::util::splitString(m_text, "\n");
m_lines.push_back("");
@@ -2282,7 +2284,7 @@ namespace hex::plugin::builtin {
m_globalTokenRange.clear();
m_globalTokenRange.insert(Interval(0, m_tokens.size()-1));
m_text = m_viewPatternEditor->getTextEditor().GetText();
m_text = m_viewPatternEditor->getTextEditor().getText();
if (m_text.empty() || m_text == "\n")
return;
@@ -2305,13 +2307,13 @@ namespace hex::plugin::builtin {
colorRemainingIdentifierTokens();
setRequestedIdentifierColors();
m_viewPatternEditor->getTextEditor().ClearErrorMarkers();
m_viewPatternEditor->getTextEditor().clearErrorMarkers();
m_compileErrors = patternLanguage->get()->getCompileErrors();
if (!m_compileErrors.empty())
renderErrors();
else
m_viewPatternEditor->getTextEditor().ClearErrorMarkers();
m_viewPatternEditor->getTextEditor().clearErrorMarkers();
} catch (const std::out_of_range &e) {
log::debug("TextHighlighter::highlightSourceCode: Out of range error: {}", e.what());
m_wasInterrupted = true;