diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 003d04b4..14a97cf9 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -1752,18 +1752,19 @@ QStringList Editor::getExpressionAtPositionForCompletion( return result; break; case LastSymbolType::ParenthesisMatched: //before '()' - if (token == ".") { - lastSymbolType=LastSymbolType::ObjectMemberOperator; - } else if (token=="->") { - lastSymbolType = LastSymbolType::PointerMemberOperator; - } else if (token == ".*") { - lastSymbolType = LastSymbolType::PointerToMemberOfObjectOperator; - } else if (token == "->*"){ - lastSymbolType = LastSymbolType::PointerToMemberOfPointerOperator; - } else if (token==">") { - lastSymbolType=LastSymbolType::MatchingAngleQuotation; - symbolMatchingLevel=0; - } else if (token == ")" ) { +// if (token == ".") { +// lastSymbolType=LastSymbolType::ObjectMemberOperator; +// } else if (token=="->") { +// lastSymbolType = LastSymbolType::PointerMemberOperator; +// } else if (token == ".*") { +// lastSymbolType = LastSymbolType::PointerToMemberOfObjectOperator; +// } else if (token == "->*"){ +// lastSymbolType = LastSymbolType::PointerToMemberOfPointerOperator; +// } else if (token==">") { +// lastSymbolType=LastSymbolType::MatchingAngleQuotation; +// symbolMatchingLevel=0; +// } else + if (token == ")" ) { lastSymbolType=LastSymbolType::MatchingParenthesis; symbolMatchingLevel = 0; } else if (token == "]") { diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp index 2fff3f41..ce176499 100644 --- a/RedPandaIDE/parser/cppparser.cpp +++ b/RedPandaIDE/parser/cppparser.cpp @@ -132,8 +132,9 @@ QList CppParser::getListOfFunctions(const QString &fileName, const Q PStatement CppParser::findAndScanBlockAt(const QString &filename, int line) { QMutexLocker locker(&mMutex); - if (mParsing) + if (mParsing) { return PStatement(); + } PFileIncludes fileIncludes = mPreprocessor.includesList().value(filename); if (!fileIncludes) return PStatement(); diff --git a/RedPandaIDE/version.h b/RedPandaIDE/version.h index f09d0908..b0bd27b4 100644 --- a/RedPandaIDE/version.h +++ b/RedPandaIDE/version.h @@ -2,6 +2,6 @@ #define VERSION_H #include -#define DEVCPP_VERSION "beta.0.11.0" +#define DEVCPP_VERSION "beta.0.11.1" #endif // VERSION_H