work save

This commit is contained in:
Roy Qu 2021-12-12 13:02:00 +08:00
parent 8d880efd24
commit 2de2f1e162
3 changed files with 16 additions and 14 deletions

View File

@ -1752,18 +1752,19 @@ QStringList Editor::getExpressionAtPositionForCompletion(
return result; return result;
break; break;
case LastSymbolType::ParenthesisMatched: //before '()' case LastSymbolType::ParenthesisMatched: //before '()'
if (token == ".") { // if (token == ".") {
lastSymbolType=LastSymbolType::ObjectMemberOperator; // lastSymbolType=LastSymbolType::ObjectMemberOperator;
} else if (token=="->") { // } else if (token=="->") {
lastSymbolType = LastSymbolType::PointerMemberOperator; // lastSymbolType = LastSymbolType::PointerMemberOperator;
} else if (token == ".*") { // } else if (token == ".*") {
lastSymbolType = LastSymbolType::PointerToMemberOfObjectOperator; // lastSymbolType = LastSymbolType::PointerToMemberOfObjectOperator;
} else if (token == "->*"){ // } else if (token == "->*"){
lastSymbolType = LastSymbolType::PointerToMemberOfPointerOperator; // lastSymbolType = LastSymbolType::PointerToMemberOfPointerOperator;
} else if (token==">") { // } else if (token==">") {
lastSymbolType=LastSymbolType::MatchingAngleQuotation; // lastSymbolType=LastSymbolType::MatchingAngleQuotation;
symbolMatchingLevel=0; // symbolMatchingLevel=0;
} else if (token == ")" ) { // } else
if (token == ")" ) {
lastSymbolType=LastSymbolType::MatchingParenthesis; lastSymbolType=LastSymbolType::MatchingParenthesis;
symbolMatchingLevel = 0; symbolMatchingLevel = 0;
} else if (token == "]") { } else if (token == "]") {

View File

@ -132,8 +132,9 @@ QList<PStatement> CppParser::getListOfFunctions(const QString &fileName, const Q
PStatement CppParser::findAndScanBlockAt(const QString &filename, int line) PStatement CppParser::findAndScanBlockAt(const QString &filename, int line)
{ {
QMutexLocker locker(&mMutex); QMutexLocker locker(&mMutex);
if (mParsing) if (mParsing) {
return PStatement(); return PStatement();
}
PFileIncludes fileIncludes = mPreprocessor.includesList().value(filename); PFileIncludes fileIncludes = mPreprocessor.includesList().value(filename);
if (!fileIncludes) if (!fileIncludes)
return PStatement(); return PStatement();

View File

@ -2,6 +2,6 @@
#define VERSION_H #define VERSION_H
#include <QObject> #include <QObject>
#define DEVCPP_VERSION "beta.0.11.0" #define DEVCPP_VERSION "beta.0.11.1"
#endif // VERSION_H #endif // VERSION_H