Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-11 05:42:15 +01:00
Code Releases Wiki Activity

fix: Console either printed no newlines or printed extra ones. (#2016)

Browse Source 
The reason for the error were the text preprocessor added to deal with
tabs was created to process entire files, not just lines or words. In
that context it cleaned trailing new lines if any existed but in the new
role that's not only unwanted but erroneous.

### Problem description
After that was fixed the console started to add two empty lines between
each output line. When splitting a string using new lines you need to
not add a new line to the last line created. Even if the text ends in an
end line, the split screen code is set to not discard empty lines.

### Implementation description
The fixes are straightforward.
This commit is contained in:
paxcut 2024-12-18 12:19:18 -07:00 committed by GitHub
parent 0f53656952
commit 4a74bd78fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp vendored
View File

@ -2066,12 +2066,14 @@ std::vector<std::string> TextEditor::SplitString(const std::string &string, cons
std::string TextEditor::ReplaceTabsWithSpaces(const std::string& string, uint32_t tabSize) {
if (tabSize == 0)
if (tabSize == 0 || string.empty() || string.find('\t') == std::string::npos)
return string;
auto stringVector = SplitString(string, "\n", false);
auto size = stringVector.size();
std::string result;
for (auto &line : stringVector) {
for (size_t i = 0; i < size - 1; i++) {
auto &line = stringVector[i];
std::size_t pos = 0;
while ((pos = line.find('\t', pos)) != std::string::npos) {
auto spaces = tabSize - (pos % tabSize);
@ -2088,8 +2090,7 @@ std::string TextEditor::PreprocessText(const std::string &code) {
std::string result = ReplaceStrings(code, "\r\n", "\n");
result = ReplaceStrings(result, "\r", "\n");
result = ReplaceTabsWithSpaces(result, 4);
while (result.ends_with('\n'))
result.pop_back();
return result;
}