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

Gui: fixes #8501: FreeCAD crashes when constraining a sketch with an expression containing . (dot)

Browse Source
This commit is contained in:
wmayer
2023-03-08 19:17:36 +01:00
committed by wwmayer
parent 0f6a79a474
commit a72ca7f424
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Gui/ExpressionCompleter.cpp
View File

@@ -759,7 +759,7 @@ QStringList ExpressionCompleter::splitPath(const QString& input) const
}
catch (const Base::Exception& except) {
FC_TRACE("split path " << path << " error: " << except.what());
if (!retry) {
if (retry == 0) {
size_t lastElemStart = path.rfind('.');
if (lastElemStart == std::string::npos) {
@@ -779,21 +779,27 @@ QStringList ExpressionCompleter::splitPath(const QString& input) const
lastElem = "";
}
// else... we don't reset lastElem if it's a '.' or '#' to allow chaining completions
char last = path[path.size() - 1];
if (last != '#' && last != '.' && path.find('#') != std::string::npos) {
path += "._self";
++retry;
continue;
if (!path.empty()) {
char last = path[path.size() - 1];
if (last != '#' && last != '.' && path.find('#') != std::string::npos) {
path += "._self";
++retry;
continue;
}
}
}
else if (retry == 2) {
path.resize(path.size() - 6);
char last = path[path.size() - 1];
if (last != '.' && last != '<' && path.find("#<<") != std::string::npos) {
path += ">>._self";
++retry;
trim = ">>";
continue;
if (path.size() >= 6) {
path.resize(path.size() - 6);
}
if (!path.empty()) {
char last = path[path.size() - 1];
if (last != '.' && last != '<' && path.find("#<<") != std::string::npos) {
path += ">>._self";
++retry;
trim = ">>";
continue;
}
}
}
return QStringList() << input;