kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Bugfix] Gui: fix bug in expression completer tokenizing, fixes #8590

Browse Source
This commit is contained in:
0penBrain
2023-02-20 19:06:45 +01:00
committed by wwmayer
parent 91d553139d
commit 5bf522ebcf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/ExpressionCompleter.cpp
View File

@@ -820,9 +820,12 @@ void ExpressionCompleter::slotUpdate(const QString & prefix, int pos)
std::transform(result.cbegin(),
result.cend(),
std::back_inserter(tokens),
[](const std::tuple<int, int, std::string>& item) {
[&](const std::tuple<int, int, std::string>& item) {
return std::make_tuple(
get<0>(item), get<1>(item), QString::fromStdString(get<2>(item)));
get<0>(item),
QString::fromStdString(expr.toStdString().substr(0,get<1>(item))).size(),
QString::fromStdString(get<2>(item))
);
});
return tokens;
};
@@ -883,7 +886,9 @@ void ExpressionCompleter::slotUpdate(const QString & prefix, int pos)
}
// Not an unclosed string and the last character is a space
if (!stringing && !prefix.isEmpty() && prefix[prefixEnd-1] == QChar(32)) {
if (!stringing && !prefix.isEmpty() &&
prefixEnd > 0 && prefixEnd <= prefix.size() &&
prefix[prefixEnd-1] == QChar(32)) {
if (auto itemView = popup())
itemView->setVisible(false);
return;