- enhancement: Rename symbols won't remove all breakpoints/bookmarks

- enhancement: Batch replace won't remove all breakpoints/bookmarks
  - enhancement: Execute parameters can be used in debug.

NEWS.md

@@ -25,6 +25,9 @@ Red Panda C++ Version 2.8
   - fix: Result of scope calculation not right if a for statement immediately follows another for statement.
   - fix: Function parameters that is pointer,reference or array can't be correctly parsed.
   - fix: In column mode, selection that contain lines with different length will cause error.
+  - enhancement: Rename symbols won't remove all breakpoints/bookmarks
+  - enhancement: Batch replace won't remove all breakpoints/bookmarks
+  - enhancement: Execute parameters can be used in debug.
 
 Red Panda C++ Version 2.7
 

RedPandaIDE/compiler/compiler.h

@@ -35,6 +35,8 @@ public:
         StdIn
     };
     Compiler(const QString& filename, bool silent,bool onlyCheckSyntax);
+    Compiler(const Compiler&)=delete;
+    Compiler& operator=(const Compiler&)=delete;
 
     bool isRebuild() const;
     void setRebuild(bool isRebuild);

RedPandaIDE/compiler/compilerinfo.h

@@ -80,6 +80,9 @@ class CompilerInfo
 {
 public:
     CompilerInfo(const QString& name);
+    CompilerInfo(const CompilerInfo&)=delete;
+    CompilerInfo& operator=(const CompilerInfo&)=delete;
+
     const QList<PCompilerOption> &compilerOptions() const;
     const QString &name() const;
     PCompilerOption getCompilerOption(const QString& key) const;

RedPandaIDE/compiler/compilermanager.h

@@ -34,6 +34,8 @@ class CompilerManager : public QObject
     Q_OBJECT
 public:
     explicit CompilerManager(QObject *parent = nullptr);
+    CompilerManager(const CompilerManager&)=delete;
+    CompilerManager& operator=(const CompilerManager&)=delete;
 
     bool compiling();
     bool backgroundSyntaxChecking();

RedPandaIDE/compiler/executablerunner.h

@@ -27,6 +27,8 @@ class ExecutableRunner : public Runner
 public:
     ExecutableRunner(const QString& filename, const QString& arguments, const QString& workDir,
                      QObject* parent = nullptr);
+    ExecutableRunner(const ExecutableRunner&)=delete;
+    ExecutableRunner& operator=(const ExecutableRunner&)=delete;
 
     const QString &redirectInputFilename() const;
     void setRedirectInputFilename(const QString &newDataFile);

RedPandaIDE/compiler/filecompiler.h

@@ -26,7 +26,8 @@ public:
     FileCompiler(const QString& filename, const QByteArray& encoding,
                  CppCompileType compileType,
                  bool silent,bool onlyCheckSyntax);
-
+    FileCompiler(const FileCompiler&)=delete;
+    FileCompiler& operator=(const FileCompiler&)=delete;
 
 protected:
     bool prepareForCompile() override;

RedPandaIDE/compiler/ojproblemcasesrunner.h

@@ -31,6 +31,8 @@ public:
     explicit OJProblemCasesRunner(const QString& filename, const QString& arguments, const QString& workDir,
                                   POJProblemCase problemCase,
                                   QObject *parent = nullptr);
+    OJProblemCasesRunner(const OJProblemCasesRunner&)=delete;
+    OJProblemCasesRunner& operator=(const OJProblemCasesRunner&)=delete;
     //max size of output buffer
     int bufferSize() const;
     void setBufferSize(int newBufferSize);

RedPandaIDE/compiler/projectcompiler.h

@@ -27,6 +27,8 @@ class ProjectCompiler : public Compiler
     Q_OBJECT
 public:
     ProjectCompiler(std::shared_ptr<Project> project, bool silent,bool onlyCheckSyntax);
+    ProjectCompiler(const ProjectCompiler&)=delete;
+    ProjectCompiler& operator=(const ProjectCompiler&)=delete;
     void buildMakeFile();
 
     bool onlyClean() const;

RedPandaIDE/compiler/runner.h

@@ -24,6 +24,8 @@ class Runner : public QThread
     Q_OBJECT
 public:
     explicit Runner(const QString& filename, const QString& arguments, const QString& workDir, QObject *parent = nullptr);
+    Runner(const Runner&)=delete;
+    Runner operator=(const Runner&)=delete;
 
     bool pausing() const;
 

RedPandaIDE/compiler/stdincompiler.h

@@ -25,6 +25,8 @@ class StdinCompiler : public Compiler
 
 public:
     explicit StdinCompiler(const QString& filename, const QByteArray& encoding, const QString& content, bool silent,bool onlyCheckSyntax);
+    StdinCompiler(const StdinCompiler&)=delete;
+    StdinCompiler& operator=(const StdinCompiler&)=delete;
 
 protected:
     bool prepareForCompile() override;

RedPandaIDE/cpprefacter.cpp

@@ -277,14 +277,50 @@ PSearchResultTreeItem CppRefacter::findOccurenceInFile(
 void CppRefacter::renameSymbolInFile(const QString &filename, const PStatement &statement,  const QString &newWord, const PCppParser &parser)
 {
     QStringList buffer;
-    Editor editor(nullptr);
-    if (pMainWindow->editorList()->getContentFromOpenedEditor(
-                filename,buffer)){
-        editor.document()->setContents(buffer);
+    Editor * oldEditor=pMainWindow->editorList()->getOpenedEditorByFilename(filename);
+    if (oldEditor){
+        QSynedit::PSyntaxer syntaxer = syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP);
+        int posY = 0;
+        while (posY < oldEditor->document()->count()) {
+            QString line = oldEditor->document()->getLine(posY);
+            if (posY == 0) {
+                syntaxer->resetState();
             } else {
+                syntaxer->setState(
+                            oldEditor->document()->getSyntaxState(posY-1));
+            }
+            syntaxer->setLine(line,posY);
+            QString newLine;
+            while (!syntaxer->eol()) {
+                int start = syntaxer->getTokenPos() + 1;
+                QString token = syntaxer->getToken();
+                if (token == statement->command) {
+                    //same name symbol , test if the same statement;
+                    QSynedit::BufferCoord p;
+                    p.line = posY+1;
+                    p.ch = start;
+
+                    QStringList expression = oldEditor->getExpressionAtPosition(p);
+                    PStatement tokenStatement = parser->findStatementOf(
+                                filename,
+                                expression, p.line);
+                    if (tokenStatement
+                            && (tokenStatement->line == statement->line)
+                            && (tokenStatement->fileName == statement->fileName)) {
+                        token = newWord;
+                    }
+                }
+                newLine += token;
+                syntaxer->next();
+            }
+            if (newLine!=line)
+                oldEditor->replaceLine(posY+1,newLine);
+            posY++;
+        }
+    } else {
+        Editor editor(nullptr);
         QByteArray encoding;
         editor.document()->loadFromFile(filename,ENCODING_AUTO_DETECT,encoding);
-    }
         QStringList newContents;
         editor.setSyntaxer(syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP));
         int posY = 0;
@@ -324,21 +360,6 @@ void CppRefacter::renameSymbolInFile(const QString &filename, const PStatement &
             newContents.append(newLine);
             posY++;
         }
-
-    Editor * oldEditor = pMainWindow->editorList()->getOpenedEditorByFilename(filename);
-    if (oldEditor) {
-        QSynedit::BufferCoord oldXY=oldEditor->caretXY();
-        int topLine = oldEditor->topLine();
-        int leftChar = oldEditor->leftChar();
-        oldEditor->beginUndoBlock();
-        oldEditor->addLeftTopToUndo();
-        oldEditor->addCaretToUndo();
-        oldEditor->replaceAll(newContents.join(oldEditor->lineBreak()));
-        oldEditor->setTopLine(topLine);
-        oldEditor->setLeftChar(leftChar);
-        oldEditor->setCaretXY(oldXY);
-        oldEditor->endUndoBlock();
-    } else {
         QByteArray realEncoding;
         QFile file(filename);
         editor.document()->saveToFile(file,ENCODING_AUTO_DETECT,

RedPandaIDE/debugger.cpp

@@ -130,7 +130,10 @@ bool Debugger::start(int compilerSetIndex, const QString& inferior, const QStrin
     mWatchModel->resetAllVarInfos();
     if (pSettings->debugger().useGDBServer()) {
         //deleted when thread finished
-        mTarget = new DebugTarget(inferior,compilerSet->debugServer(),pSettings->debugger().GDBServerPort());
+        QString params;
+        if (pSettings->executor().useParams())
+            params = pSettings->executor().params();
+        mTarget = new DebugTarget(inferior,compilerSet->debugServer(),pSettings->debugger().GDBServerPort(),params);
         if (pSettings->executor().redirectInput())
             mTarget->setInputFile(pSettings->executor().inputFilename());
         connect(mTarget, &QThread::finished,[this](){
@@ -2668,9 +2671,11 @@ DebugTarget::DebugTarget(
         const QString &inferior,
         const QString &GDBServer,
         int port,
+        const QString& arguments,
         QObject *parent):
     QThread(parent),
     mInferior(inferior),
+    mArguments(arguments),
     mGDBServer(GDBServer),
     mPort(port),
     mStop(false),
@@ -2720,7 +2725,7 @@ void DebugTarget::run()
     QString arguments;
 #ifdef Q_OS_WIN
     cmd= mGDBServer;
-    arguments = QString(" localhost:%1 \"%2\"").arg(mPort).arg(mInferior);
+    arguments = QString(" localhost:%1 \"%2\" %3").arg(mPort).arg(mInferior,mArguments);
 #else
     cmd= pSettings->environment().terminalPath();
     arguments = QString(" -e \"%1\" localhost:%2 \"%3\"").arg(mGDBServer).arg(mPort).arg(mInferior);

RedPandaIDE/debugger.h

@@ -413,6 +413,7 @@ public:
     explicit DebugTarget(const QString& inferior,
                          const QString& GDBServer,
                          int port,
+                         const QString& arguments,
                          QObject *parent = nullptr);
     void setInputFile(const QString& inputFile);
     void stopDebug();
@@ -424,6 +425,7 @@ signals:
     void processError(QProcess::ProcessError error);
 private:
     QString mInferior;
+    QString mArguments;
     QString mGDBServer;
     int mPort;
     bool mStop;

RedPandaIDE/mainwindow.cpp

@@ -2315,11 +2315,17 @@ void MainWindow::debug()
         if (!debugInferiorhasBreakpoint()) {
             mDebugger->sendCommand("-break-insert","-t main");
         }
+        if (pSettings->executor().useParams()) {
+            mDebugger->sendCommand("-exec-arguments", pSettings->executor().params());
+        }
         mDebugger->sendCommand("-exec-continue","");
     } else {
 #ifdef Q_OS_WIN
         mDebugger->sendCommand("-gdb-set", "new-console on");
 #endif
+        if (pSettings->executor().useParams()) {
+            mDebugger->sendCommand("-exec-arguments", pSettings->executor().params());
+        }
         if (!debugInferiorhasBreakpoint()) {
             mDebugger->sendCommand("-exec-run", "--start");
         } else {
@@ -7707,12 +7713,11 @@ void MainWindow::on_btnReplace_clicked()
                                   tr("Can't open file '%1' for replace!").arg(file->filename));
             return;
         }
-        contents = editor->contents();
         for (int i=file->results.count()-1;i>=0;i--) {
             const PSearchResultTreeItem& item = file->results[i];
             if (!item->selected)
                 continue;
-            QString line = contents[item->line-1];
+            QString line = editor->document()->getLine(item->line-1);
             if (line.mid(item->start-1,results->keyword.length())!=results->keyword) {
                 QMessageBox::critical(editor,
                             tr("Replace Error"),
@@ -7721,15 +7726,8 @@ void MainWindow::on_btnReplace_clicked()
             }
             line.remove(item->start-1,results->keyword.length());
             line.insert(item->start-1, newWord);
-            contents[item->line-1] = line;
+            editor->replaceLine(item->line,line);
         }
-        QSynedit::BufferCoord coord=editor->caretXY();
-        int topLine = editor->topLine();
-        int leftChar = editor->leftChar();
-        editor->replaceAll(contents.join(editor->lineBreak()));
-        editor->setCaretXY(coord);
-        editor->setTopLine(topLine);
-        editor->setLeftChar(leftChar);
     }
     showSearchReplacePanel(false);
     stretchMessagesPanel(false);

RedPandaIDE/parser/cppparser.h

@@ -31,6 +31,9 @@ class CppParser : public QObject
 
 public:
     explicit CppParser(QObject *parent = nullptr);
+    CppParser(const CppParser&)=delete;
+    CppParser& operator=(const CppParser)=delete;
+
     ~CppParser();
 
     void addHardDefineByLine(const QString& line);

RedPandaIDE/parser/cpppreprocessor.h

@@ -61,6 +61,9 @@ class CppPreprocessor
 public:
 
     explicit CppPreprocessor();
+    CppPreprocessor(const CppPreprocessor&)=delete;
+    CppPreprocessor& operator=(const CppPreprocessor&)=delete;
+
     void clear();
 
     void clearTempResults();

RedPandaIDE/parser/cpptokenizer.h

@@ -43,6 +43,8 @@ public:
     using PToken = std::shared_ptr<Token>;
     using TokenList = QVector<PToken>;
     explicit CppTokenizer();
+    CppTokenizer(const CppTokenizer&)=delete;
+    CppTokenizer& operator=(const CppTokenizer&)=delete;
 
     void clear();
     void tokenize(const QStringList& buffer);

RedPandaIDE/parser/statementmodel.h

@@ -26,6 +26,8 @@ class StatementModel : public QObject
     Q_OBJECT
 public:
     explicit StatementModel(QObject *parent = nullptr);
+    StatementModel(const StatementModel&)=delete;
+    StatementModel& operator=(const StatementModel&)=delete;
 
     void add(const PStatement& statement);
 //    function DeleteFirst: Integer;

libs/qsynedit/qsynedit/document.h

@@ -169,6 +169,7 @@ enum class ChangeReason {
     LineBreak,
     MoveSelectionUp,
     MoveSelectionDown,
+    ReplaceLine,
     Nothing // undo list empty
   };
 

libs/qsynedit/qsynedit/painter.h

@@ -41,6 +41,9 @@ class QSynEditPainter
 public:
     QSynEditPainter(QSynEdit * edit,QPainter* painter,int FirstRow, int LastRow,
                        int FirstCol, int LastCol);
+    QSynEditPainter(const QSynEditPainter&)=delete;
+    QSynEditPainter& operator=(const QSynEditPainter&)=delete;
+
     void paintTextLines(const QRect& clip);
     void paintGutter(const QRect& clip);
 

libs/qsynedit/qsynedit/qsynedit.cpp

@@ -4367,6 +4367,18 @@ void QSynEdit::doUndoItem()
             ensureCursorPosVisible();
             break;
         }
+        case ChangeReason::ReplaceLine:
+            qDebug()<<item->changeStartPos().line<<item->changeText();
+            mRedoList->addRedo(
+                        item->changeReason(),
+                        item->changeStartPos(),
+                        item->changeEndPos(),
+                        QStringList(mDocument->getLine(item->changeStartPos().line-1)),
+                        item->changeSelMode(),
+                        item->changeNumber()
+                        );
+            mDocument->putLine(item->changeStartPos().line-1,item->changeText()[0]);
+            break;
         case ChangeReason::MoveSelectionUp:
             setBlockBegin(BufferCoord{item->changeStartPos().ch, item->changeStartPos().line-1});
             setBlockEnd(BufferCoord{item->changeEndPos().ch, item->changeEndPos().line-1});
@@ -4564,6 +4576,17 @@ void QSynEdit::doRedoItem()
                         item->changeSelMode(),
                         item->changeNumber());
             break;
+        case ChangeReason::ReplaceLine:
+            mUndoList->restoreChange(
+                        item->changeReason(),
+                        item->changeStartPos(),
+                        item->changeEndPos(),
+                        QStringList(mDocument->getLine(item->changeStartPos().line-1)),
+                        item->changeSelMode(),
+                        item->changeNumber()
+                        );
+            mDocument->putLine(item->changeStartPos().line-1,item->changeText()[0]);
+            break;
         case ChangeReason::Insert:
             setCaretAndSelection(
                         item->changeStartPos(),
@@ -6850,6 +6873,15 @@ void QSynEdit::setSelText(const QString &text)
     doSetSelText(text);
 }
 
+void QSynEdit::replaceLine(int line, const QString &lineText)
+{
+    BufferCoord pos;
+    pos.line=line;
+    pos.ch=1;
+    mUndoList->addChange(ChangeReason::ReplaceLine,pos,pos,QStringList(mDocument->getLine(line-1)),SelectionMode::Normal);
+    mDocument->putLine(line-1,lineText);
+}
+
 BufferCoord QSynEdit::blockBegin() const
 {
     if (mActiveSelectionMode==SelectionMode::Column)

libs/qsynedit/qsynedit/qsynedit.h

@@ -138,6 +138,8 @@ class QSynEdit : public QAbstractScrollArea
     Q_OBJECT
 public:
     explicit QSynEdit(QWidget* parent=nullptr);
+    QSynEdit(const QSynEdit&)=delete;
+    QSynEdit& operator=(const QSynEdit&)=delete;
     /**
      * Returns how many rows are there in the editor
      * @return
@@ -232,6 +234,7 @@ public:
     void setSelLength(int Value);
     void setSelText(const QString& text);
 
+    void replaceLine(int line, const QString& lineText);
     int searchReplace(const QString& sSearch, const QString& sReplace, SearchOptions options,
                PSynSearchBase searchEngine,  SearchMathedProc matchedCallback = nullptr,
                       SearchConfirmAroundProc confirmAroundCallback = nullptr);