From 205feae9d16a81d7ffcce86cb2a317f3ff2414ee Mon Sep 17 00:00:00 2001 From: Eivind Kvedalen Date: Sat, 2 Jan 2016 21:02:18 +0100 Subject: [PATCH] ExpressionCompleter: Remove '=' before tokenizing string, to improve completer when used in the spreadsheet. --- src/Gui/ExpressionCompleter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp index fca8ca9d52..6ac89197e2 100644 --- a/src/Gui/ExpressionCompleter.cpp +++ b/src/Gui/ExpressionCompleter.cpp @@ -236,7 +236,8 @@ QStringList ExpressionCompleter::splitPath ( const QString & path ) const void ExpressionCompleter::slotUpdate(const QString & prefix) { using namespace boost::tuples; - std::vector > tokens = ExpressionParser::tokenize(Base::Tools::toStdString(prefix)); + int j = (prefix.size() > 0 && prefix.at(0) == QChar::fromAscii('=')) ? 1 : 0; + std::vector > tokens = ExpressionParser::tokenize(Base::Tools::toStdString(prefix.mid(j))); std::string completionPrefix; if (tokens.size() == 0 || (prefix.size() > 0 && prefix[prefix.size() - 1] == QChar(32))) {