From 20917e3a8bbb52f1a90729ebd71e86a22efc8130 Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Thu, 3 Nov 2022 00:49:22 +0800
Subject: [PATCH] work save

---
 NEWS.md                               |  7 +++++
 RedPandaIDE/RedPandaIDE.pro           |  2 +-
 RedPandaIDE/parser/cppparser.cpp      | 42 +++++++++++++++++++--------
 RedPandaIDE/parser/cppparser.h        |  4 ++-
 RedPandaIDE/parser/cpptokenizer.cpp   |  6 ++--
 Red_Panda_CPP.pro                     |  2 +-
 libs/qsynedit/qsynedit/TextBuffer.cpp |  2 +-
 7 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 783c2d3a..11662470 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,10 @@
+Red Panda C++ Version 2.2
+
+  - enhancement: basic code completion support for C++ lambda
+  - enhancement: slightly reduce parsing time
+  - fix: Wrong charset name returned when saveing file
+  - fix: 'using =' / 'namespace =' not correctly handled
+
 Red Panda C++ Version 2.1
 
   - fix: editors that not in the editing panel shouldn't trigger switch breakpoint
diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index c99aa3c9..7207bfca 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -10,7 +10,7 @@ isEmpty(APP_NAME) {
 }
 
 isEmpty(APP_VERSION) {
-    APP_VERSION = 2.1
+    APP_VERSION = 2.2
 }
 
 macos: {
diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp
index bc68b7d3..00f3644a 100644
--- a/RedPandaIDE/parser/cppparser.cpp
+++ b/RedPandaIDE/parser/cppparser.cpp
@@ -1446,7 +1446,7 @@ void CppParser::addSoloScopeLevel(PStatement& statement, int line, bool shouldRe
     else
         mClassScope = StatementClassScope::Public; // structs are public by default
     mCurrentClassScope.append(mClassScope);
-    //qDebug()<<"++add scope"<<mCurrentFile<<line<<mCurrentClassScope.count();
+    qDebug()<<"++add scope"<<mCurrentFile<<line<<mCurrentClassScope.count();
 }
 
 void CppParser::removeScopeLevel(int line)
@@ -1454,7 +1454,7 @@ void CppParser::removeScopeLevel(int line)
     // Remove class list
     if (mCurrentScope.isEmpty())
         return; // TODO: should be an exception
-    //qDebug()<<"--remove scope"<<mCurrentFile<<line<<mCurrentClassScope.count();
+    qDebug()<<"--remove scope"<<mCurrentFile<<line<<mCurrentClassScope.count();
     PStatement currentScope = getCurrentScope();
     PFileIncludes fileIncludes = mPreprocessor.includesList().value(mCurrentFile);
     if (currentScope && (currentScope->kind == StatementKind::skBlock)) {
@@ -2320,9 +2320,6 @@ void CppParser::handleMethod(const QString &sType, const QString &sName, int arg
                 mIndex=mTokenizer[mIndex+1]->matchIndex+1;
             } else if (mTokenizer[mIndex]->text=='(') {
                 mIndex=mTokenizer[mIndex]->matchIndex+1;
-            }else if (mTokenizer[mIndex]->text==':') {
-                foundColon=true;
-                break;
             } else
                 mIndex++;
         }
@@ -2534,10 +2531,13 @@ void CppParser::handleNamespace(KeywordType skipType)
                     mClassScope,
                     true,
                     false);
-        addSoloScopeLevel(namespaceStatement,startLine);
 
-        // Skip pass next '{'
-        mIndex = indexOfNextLeftBrace(mIndex)+1;
+        // find next '{' or ';'
+        mIndex = indexOfNextSemicolonOrLeftBrace(mIndex);
+        if (mTokenizer[mIndex]->text=='{')
+            addSoloScopeLevel(namespaceStatement,startLine);
+        //skip it
+        mIndex++;
     }
 }
 
@@ -2667,6 +2667,7 @@ void CppParser::handlePreprocessor()
             goto handlePreprocessorEnd;
         int delimPos = s.lastIndexOf(':');
         if (delimPos>=0) {
+            qDebug()<<mCurrentScope.size()<<mCurrentFile<<mTokenizer[mIndex]->line<<s.mid(0,delimPos).trimmed();
             mCurrentFile = s.mid(0,delimPos).trimmed();
             mIsSystemHeader = isSystemHeaderFile(mCurrentFile) || isProjectHeaderFile(mCurrentFile);
             mIsProjectFile = mProjectFiles.contains(mCurrentFile);
@@ -3396,7 +3397,7 @@ void CppParser::internalParse(const QString &fileName)
 
         QStringList preprocessResult = mPreprocessor.result();
 #ifdef QT_DEBUG
-//        stringsToFile(mPreprocessor.result(),QString("r:\\preprocess-%1.txt").arg(extractFileName(fileName)));
+        stringsToFile(mPreprocessor.result(),QString("r:\\preprocess-%1.txt").arg(extractFileName(fileName)));
 //        mPreprocessor.dumpDefinesTo("r:\\defines.txt");
 //        mPreprocessor.dumpIncludesListTo("r:\\includes.txt");
 #endif
@@ -3410,7 +3411,7 @@ void CppParser::internalParse(const QString &fileName)
         if (mTokenizer.tokenCount() == 0)
             return;
 #ifdef QT_DEBUG
-//        mTokenizer.dumpTokens(QString("r:\\tokens-%1.txt").arg(extractFileName(fileName)));
+        mTokenizer.dumpTokens(QString("r:\\tokens-%1.txt").arg(extractFileName(fileName)));
 #endif
         // Process the token list
         while(true) {
@@ -3418,8 +3419,8 @@ void CppParser::internalParse(const QString &fileName)
                 break;
         }
 #ifdef QT_DEBUG
-//        mStatementList.dumpAll(QString("r:\\all-stats-%1.txt").arg(extractFileName(fileName)));
-//        mStatementList.dump(QString("r:\\stats-%1.txt").arg(extractFileName(fileName)));
+        mStatementList.dumpAll(QString("r:\\all-stats-%1.txt").arg(extractFileName(fileName)));
+        mStatementList.dump(QString("r:\\stats-%1.txt").arg(extractFileName(fileName)));
 #endif
         //reduce memory usage
         internalClear();
@@ -4790,6 +4791,23 @@ int CppParser::indexOfNextSemicolon(int index)
     return index;
 }
 
+int CppParser::indexOfNextSemicolonOrLeftBrace(int index)
+{
+    while (index<mTokenizer.tokenCount()) {
+        switch(mTokenizer[index]->text[0].unicode()) {
+        case ';':
+        case '{':
+            return index;
+        case '(':
+            index = mTokenizer[index]->matchIndex+1;
+            break;
+        default:
+            index++;
+        }
+    }
+    return index;
+}
+
 int CppParser::indexOfNextColon(int index)
 {
     while (index<mTokenizer.tokenCount()) {
diff --git a/RedPandaIDE/parser/cppparser.h b/RedPandaIDE/parser/cppparser.h
index c9dce8c7..bbbc0600 100644
--- a/RedPandaIDE/parser/cppparser.h
+++ b/RedPandaIDE/parser/cppparser.h
@@ -467,13 +467,14 @@ private:
     }
 
     bool isInvalidFunctionArgsSuffixChar(const QChar& ch) const {
+
+        // &&
         switch(ch.unicode()){
         case '.':
         case '-':
         case '+':
         case '/':
         case '%':
-        case '&':
         case '*':
         case '|':
         case '?':
@@ -563,6 +564,7 @@ private:
     void updateSerialId();
 
     int indexOfNextSemicolon(int index);
+    int indexOfNextSemicolonOrLeftBrace(int index);
     int indexOfNextColon(int index);
     int indexOfNextLeftBrace(int index);
     int indexPassParenthesis(int index);
diff --git a/RedPandaIDE/parser/cpptokenizer.cpp b/RedPandaIDE/parser/cpptokenizer.cpp
index 7e0b616d..f3e3c417 100644
--- a/RedPandaIDE/parser/cpptokenizer.cpp
+++ b/RedPandaIDE/parser/cpptokenizer.cpp
@@ -735,8 +735,10 @@ void CppTokenizer::advance()
             mCurrent++;
         break;
     case '=': {
-        if (mTokenList.size()>2
-                && mTokenList[mTokenList.size()-2]->text == "using") {
+        if (mTokenList.size()>=2
+                &&( mTokenList[mTokenList.size()-2]->text == "using"
+                    || mTokenList[mTokenList.size()-2]->text == "namespace")
+                ) {
             addToken("=", mCurrentLine, TokenType::Normal);
             mCurrent++;
         } else
diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro
index 8df55dc9..52cb979b 100644
--- a/Red_Panda_CPP.pro
+++ b/Red_Panda_CPP.pro
@@ -33,7 +33,7 @@ RedPandaIDE.depends += redpanda-git-askpass
 
 APP_NAME = RedPandaCPP
 
-APP_VERSION = 2.1
+APP_VERSION = 2.2
 
 linux: {
     isEmpty(PREFIX) {
diff --git a/libs/qsynedit/qsynedit/TextBuffer.cpp b/libs/qsynedit/qsynedit/TextBuffer.cpp
index fb97aa01..8c00fa1d 100644
--- a/libs/qsynedit/qsynedit/TextBuffer.cpp
+++ b/libs/qsynedit/qsynedit/TextBuffer.cpp
@@ -688,7 +688,7 @@ void Document::saveToFile(QFile &file, const QByteArray& encoding,
     if (allAscii) {
         realEncoding = ENCODING_ASCII;
     } else if (encoding == ENCODING_AUTO_DETECT) {
-        if (codec->name().compare("System",Qt::CaseInsensitive)) {
+        if (codec->name().compare("System",Qt::CaseInsensitive)==0) {
             realEncoding = pCharsetInfoManager->getDefaultSystemEncoding();
         } else {
             realEncoding = codec->name();