Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

NEWS.md

@@ -8,9 +8,22 @@ Red Panda C++ Version 2.18
   - enhancement: Warn user and stop compile if project has missing files.
   - enhancement: Warn user when exit and save settings failed.
   - change: Remove compiler set options that's rarely used.
-  - enhancement: Options in compiler set settings, to generate syntax error for large stack objects. （Enable for Debug settings by default)
-  - enhancement: Options in compiler set settings, to generate protection code for stack smashing attack. （Enable for Debug settings by default)
-  - enhancement: Options in compiler set settings, to enable address sanitizer. Not available in windows.（Enable for Debug settings by default)
+  - enhancement: Add option in the compiler set settings, to generate syntax error for large stack objects. （Enable for Debug settings by default)
+  - enhancement: Add option in the compiler set settings, to generate protection code for stack smashing attack. （Enable for Debug settings by default)
+  - enhancement: Add option in the compiler set settings, to enable address sanitizer. Not available in windows.（Enable for Debug settings by default)
+  - fix: The comboxbox to input search keyword in the search dialog is case insensitive.
+  - fix: The comboxbox to input replace text in the search dialog is case insensitive.
+  - fix: The comboxbox to input search keyword in the search in files dialog is case insensitive.
+  - fix: The comboxbox to input address expression in the debug panel's memory view is case insensitive.
+  - fix: The comboxbox to input evaluation expression in the debug panel is case insensitive.
+  - fix: The comboxbox to input replace text in the search panel is case insensitive.
+  - fix: None initialized std::vector is not correctly displayed in the gdb of the gcc distributed with redpanda-c++ (Windows 64bit).
+  - fix: Don't show completion info when input parameters for function definitions.
+  - fix: Don't show function info tips when typing class variable definitions.
+  - enhancement: Add option in the debug settings, to limit the length of the ouput generated by gdb for arrays.
+  - enhancement: Show shortcut info in toolbar's tooltip.
+  - change: Use F11 as the shortcut for "Run". (It's the old shortcut for "Compile&Run")
+
 
 Red Panda C++ Version 2.17
 

RedPandaIDE/editor.cpp

@@ -1780,7 +1780,7 @@ void Editor::onStatusChanged(QSynedit::StatusChanges changes)
         }
     }
 
-    if (changes.testFlag(QSynedit::scInsertMode) | changes.testFlag(QSynedit::scReadOnly))
+    if (changes.testFlag(QSynedit::scInsertMode) || changes.testFlag(QSynedit::scReadOnly))
         pMainWindow->updateForStatusbarModeInfo();
 
     pMainWindow->updateEditorActions();
@@ -3573,45 +3573,71 @@ void Editor::cleanAutoBackup()
     }
 }
 
-bool Editor::testInFunc(int x, int y)
+bool Editor::testInFunc(const QSynedit::BufferCoord& pos)
 {
-    bool result = false;
-    QString s = document()->getLine(y);
-    int posY = y;
-    int posX = std::min(x,s.length()-1); // x is started from 1
-    int bracketLevel=0;
-    while (true) {
-        while (posX < 0) {
-            posY--;
-            if (posY < 0)
-                return false;
-            s = document()->getLine(posY);
-            posX = s.length()-1;
-        }
-        if (s[posX] == '>'
-                || s[posX] == ']') {
-            bracketLevel++;
-        } else if (s[posX] == '<'
-                   || s[posX] == '[') {
-            bracketLevel--;
-        } else if (bracketLevel==0) {
-            switch (s[posX].unicode()) {
-            case '(':
-                return true;
-            case ';':
-            case '{':
-                return false;
-            }
-            if (!(isIdentChar(s[posX])
-                  || s[posX] == ' '
-                  || s[posX] == '\t'
-                  || s[posX] == '*'
-                  || s[posX] == '&'))
-                break;;
-        }
-        posX--;
-    }
-    return result;
+    int y=pos.line-1;
+    int x=pos.ch;
+    if (!syntaxer() || syntaxer()->language()!=QSynedit::ProgrammingLanguage::CPP)
+        return false;
+    if (y==0)
+        syntaxer()->resetState();
+    else
+        syntaxer()->setState(document()->getSyntaxState(y-1));
+    syntaxer()->setLine(document()->getLine(y),y);
+//    qDebug()<<x<<document()->getLine(y).length();
+    QSynedit::SyntaxState state = syntaxer()->getState();
+    while(!syntaxer()->eol()) {
+        int start = syntaxer()->getTokenPos();
+        QString token = syntaxer()->getToken();
+        int end = start + token.length();
+//        qDebug()<<syntaxer()->getToken()<<start<<end;
+        if (end>=x)
+            break;
+        state = syntaxer()->getState();
+        syntaxer()->next();
+    }
+//    qDebug()<<state.parenthesisLevel;
+    return state.parenthesisLevel>0;
+
+
+//    bool result = false;
+//    QString s = document()->getLine(y);
+//    int posY = y;
+//    int posX = std::min(x,s.length()-1); // x is started from 1
+//    int bracketLevel=0;
+
+//    while (true) {
+//        while (posX < 0) {
+//            posY--;
+//            if (posY < 0)
+//                return false;
+//            s = document()->getLine(posY);
+//            posX = s.length()-1;
+//        }
+//        if (s[posX] == '>'
+//                || s[posX] == ']') {
+//            bracketLevel++;
+//        } else if (s[posX] == '<'
+//                   || s[posX] == '[') {
+//            bracketLevel--;
+//        } else if (bracketLevel==0) {
+//            switch (s[posX].unicode()) {
+//            case '(':
+//                return true;
+//            case ';':
+//            case '{':
+//                return false;
+//            }
+//            if (!(isIdentChar(s[posX])
+//                  || s[posX] == ' '
+//                  || s[posX] == '\t'
+//                  || s[posX] == '*'
+//                  || s[posX] == '&'))
+//                break;;
+//        }
+//        posX--;
+//    }
+//    return result;
 }
 
 void Editor::completionInsert(bool appendFunc)
@@ -4188,7 +4214,6 @@ void Editor::updateFunctionTip(bool showTip)
     QSynedit::BufferCoord pWordBegin, pWordEnd;
 
     QString s = getWordAtPosition(this, functionNamePos, pWordBegin,pWordEnd, WordPurpose::wpInformation);
-
     int x = pWordBegin.ch-1-1;
     QString line = document()->getLine(pWordBegin.line-1);
     bool hasPreviousWord=false;
@@ -4206,9 +4231,10 @@ void Editor::updateFunctionTip(bool showTip)
         break;
     }
 
+    //handle class initializer
     if (x >= 0 && hasPreviousWord) {
         QSynedit::BufferCoord pos = pWordBegin;
-        pos.ch = x+1;
+        pos.ch = pWordBegin.ch;
         QString previousWord = getPreviousWordAtPositionForSuggestion(pos);
 
         PStatement statement = mParser->findStatementOf(
@@ -4779,7 +4805,7 @@ QString Editor::getPreviousWordAtPositionForSuggestion(const QSynedit::BufferCoo
     if ((p.line<1) || (p.line>document()->count())) {
         return "";
     }
-    bool inFunc = testInFunc(p.ch-1,p.line-1);
+    bool inFunc = testInFunc(p);
 
     QString s = document()->getLine(p.line - 1);
     int wordBegin;
@@ -4800,7 +4826,7 @@ QString Editor::getPreviousWordAtPositionForSuggestion(const QSynedit::BufferCoo
               else
                   return "";
           } else if (bracketLevel==0) {
-              //we can't differentiate multiple definition and function parameter define here , so we don't handle ','
+              //Differentiate multiple definition and function parameter define here
               if (s[wordEnd] == ',') {
                   if (inFunc) // in func, dont skip ','
                       break;

RedPandaIDE/editor.h

@@ -271,7 +271,7 @@ private slots:
     void saveAutoBackup();
     void cleanAutoBackup();
 
-    bool testInFunc(int x,int y);
+    bool testInFunc(const QSynedit::BufferCoord& pos);
 
     void completionInsert(bool appendFunc=false);
 

RedPandaIDE/mainwindow.cpp

@@ -77,6 +77,7 @@
 #include <QMimeDatabase>
 #include <QMimeType>
 #include <QToolTip>
+#include <QCompleter>
 
 #include "mainwindow.h"
 #include <QScrollBar>
@@ -260,6 +261,11 @@ MainWindow::MainWindow(QWidget *parent)
 //    updateEditorActions();
 //    updateCaretActions();
 
+    ui->cbReplaceInHistory->completer()->setCaseSensitivity(Qt::CaseSensitive);
+    ui->cbEvaluate->completer()->setCaseSensitivity(Qt::CaseSensitive);
+    ui->cbMemoryAddress->completer()->setCaseSensitivity(Qt::CaseSensitive);
+    ui->cbFilesPath->completer()->setCaseSensitivity(Qt::CaseInsensitive);
+
     connect(ui->debugConsole,&QConsole::commandInput,this,&MainWindow::onDebugCommandInput);
     connect(ui->cbEvaluate->lineEdit(), &QLineEdit::returnPressed,
             this, &MainWindow::onDebugEvaluateInput);
@@ -2389,7 +2395,7 @@ void MainWindow::debug()
     mDebugger->sendCommand("-gdb-set", "width 0"); // don't wrap output, very annoying
     mDebugger->sendCommand("-gdb-set", "confirm off");
     mDebugger->sendCommand("-gdb-set", "print repeats 0"); // don't repeat elements
-    mDebugger->sendCommand("-gdb-set", "print elements 0"); // don't limit elements
+    mDebugger->sendCommand("-gdb-set", QString("print elements %1").arg(pSettings->debugger().arrayElements())); // limit array elements to 500
     mDebugger->sendCommand("-environment-cd", QString("\"%1\"").arg(extractFileDir(filePath))); // restore working directory
     if (pSettings->debugger().useGDBServer()) {
         mDebugger->sendCommand("-target-select",QString("remote localhost:%1").arg(pSettings->debugger().GDBServerPort()));

RedPandaIDE/mainwindow.ui

@@ -487,7 +487,7 @@
      <enum>QTabWidget::West</enum>
     </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="usesScrollButtons">
      <bool>true</bool>
@@ -971,7 +971,6 @@
        <widget class="IssuesTable" name="tableIssues">
         <property name="font">
          <font>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>
@@ -1133,7 +1132,7 @@
           <enum>QTabWidget::North</enum>
          </property>
          <property name="currentIndex">
-          <number>1</number>
+          <number>2</number>
          </property>
          <widget class="QWidget" name="tabDebugConsole">
           <attribute name="title">
@@ -2167,7 +2166,7 @@
     <string>Run</string>
    </property>
    <property name="shortcut">
-    <string>F10</string>
+    <string>F11</string>
    </property>
   </action>
   <action name="actionUndo">

RedPandaIDE/parser/statementmodel.cpp

@@ -84,6 +84,7 @@ void StatementModel::clear() {
 #endif
 }
 
+#ifdef QT_DEBUG
 void StatementModel::dump(const QString &logFile)
 {
     QFile file(logFile);
@@ -93,7 +94,6 @@ void StatementModel::dump(const QString &logFile)
     }
 }
 
-#ifdef QT_DEBUG
 void StatementModel::dumpAll(const QString &logFile)
 {
     QFile file(logFile);
@@ -104,11 +104,16 @@ void StatementModel::dumpAll(const QString &logFile)
              .arg(statement->command).arg(int(statement->kind))
              .arg(statement->type).arg(statement->fullName)
              .arg((size_t)(statement->parentScope.lock().get()))
-             .arg((int)statement->classScope)
+             .arg((int)statement->accessibility)
              .arg(statement->fileName)
              .arg(statement->line)
              .arg(statement->definitionFileName)
-             .arg(statement->definitionLine)<<endl;
+             .arg(statement->definitionLine)<<
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+                 Qt::endl;
+#else
+                 endl;
+#endif
         }
     }
 }

RedPandaIDE/parser/statementmodel.h

@@ -36,8 +36,8 @@ class StatementModel : public QObject
     const StatementMap& childrenStatements(const PStatement& statement = PStatement()) const;
     const StatementMap& childrenStatements(std::weak_ptr<Statement> statement) const;
     void clear();
-    void dump(const QString& logFile);
 #ifdef QT_DEBUG
+    void dump(const QString& logFile);
     void dumpAll(const QString& logFile);
 #endif
 private:

RedPandaIDE/settings.cpp

@@ -4020,6 +4020,16 @@ void Settings::Debugger::setAutosave(bool newAutosave)
     mAutosave = newAutosave;
 }
 
+int Settings::Debugger::arrayElements() const
+{
+    return mArrayElements;
+}
+
+void Settings::Debugger::setArrayElements(int newArrayElements)
+{
+    mArrayElements = newArrayElements;
+}
+
 bool Settings::Debugger::useIntelStyle() const
 {
     return mUseIntelStyle;
@@ -4068,6 +4078,7 @@ void Settings::Debugger::doSave()
     saveValue("gdb_server_port",mGDBServerPort);
     saveValue("memory_view_rows",mMemoryViewRows);
     saveValue("memory_view_columns",mMemoryViewColumns);
+    saveValue("array_elements",mArrayElements);
 }
 
 void Settings::Debugger::doLoad()
@@ -4096,6 +4107,7 @@ void Settings::Debugger::doLoad()
     mGDBServerPort = intValue("gdb_server_port",41234);
     mMemoryViewRows = intValue("memory_view_rows",16);
     mMemoryViewColumns = intValue("memory_view_columns",16);
+    mArrayElements = intValue("array_elements",300);
 }
 
 Settings::CodeCompletion::CodeCompletion(Settings *settings):_Base(settings, SETTING_CODE_COMPLETION)

RedPandaIDE/settings.h

@@ -1281,6 +1281,9 @@ class Settings
         bool autosave() const;
         void setAutosave(bool newAutosave);
 
+        int arrayElements() const;
+        void setArrayElements(int newArrayElements);
+
     private:
         bool mEnableDebugConsole;
         bool mShowDetailLog;
@@ -1298,6 +1301,7 @@ class Settings
         int mGDBServerPort;
         int mMemoryViewRows;
         int mMemoryViewColumns;
+        int mArrayElements;
 
         // _Base interface
     protected:

RedPandaIDE/settingsdialog/debuggeneralwidget.cpp

@@ -56,6 +56,7 @@ void DebugGeneralWidget::doLoad()
     ui->spinGDBServerPort->setValue(pSettings->debugger().GDBServerPort());
     ui->spinMemoryViewRows->setValue(pSettings->debugger().memoryViewRows());
     ui->spinMemoryViewColumns->setValue(pSettings->debugger().memoryViewColumns());
+    ui->spinArrayElements->setValue(pSettings->debugger().arrayElements());
 }
 
 void DebugGeneralWidget::doSave()
@@ -78,6 +79,8 @@ void DebugGeneralWidget::doSave()
     pSettings->debugger().setGDBServerPort(ui->spinGDBServerPort->value());
     pSettings->debugger().setMemoryViewRows(ui->spinMemoryViewRows->value());
     pSettings->debugger().setMemoryViewColumns(ui->spinMemoryViewColumns->value());
+    pSettings->debugger().setArrayElements(ui->spinArrayElements->value());
+
     pSettings->debugger().save();
     pMainWindow->updateDebuggerSettings();
 }