diff --git a/NEWS.md b/NEWS.md index b855d159..2f20f266 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,7 @@ Red Panda C++ Version 1.0.1 - fix: hide function tip when scroll - fix: short cut for goto definition/declaration doesn't work - enhancement: press alt to switch to column selection mode while selection by mouse dragging in editor + - fix: order for parameters generated by auto link may not correct Red Panda C++ Version 1.0.0 - fix: calculation for code snippets's tab stop positions is not correct diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 91f6bc29..48d42a86 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -3803,8 +3803,6 @@ void Editor::gotoDeclaration(const BufferCoord &pos) // Exit early, don't bother creating a stream (which is slow) QStringList expression = getExpressionAtPosition(pos); - qDebug()<findStatementOf( filename(), diff --git a/RedPandaIDE/parser/cpppreprocessor.cpp b/RedPandaIDE/parser/cpppreprocessor.cpp index cc911144..936b8b77 100644 --- a/RedPandaIDE/parser/cpppreprocessor.cpp +++ b/RedPandaIDE/parser/cpppreprocessor.cpp @@ -428,10 +428,9 @@ void CppPreprocessor::handleInclude(const QString &line, bool fromNext) if (fileName.isEmpty()) return; - //mCurrentIncludes->includeFiles.insert(fileName,true); - // And open a new entry + PFileIncludes oldCurrentIncludes = mCurrentIncludes; openInclude(fileName); - mCurrentIncludes->includeFiles.insert(fileName,true); + oldCurrentIncludes->includeFiles.insert(fileName,true); } void CppPreprocessor::handlePreprocessor(const QString &value) @@ -705,8 +704,11 @@ void CppPreprocessor::openInclude(const QString &fileName, QStringList bufferedT addDefinesInFile(fileName); PFileIncludes fileIncludes = getFileIncludesEntry(fileName); for (PParsedFile& file:mIncludes) { - file->fileIncludes->includeFiles = - file->fileIncludes->includeFiles.unite(fileIncludes->includeFiles); + foreach (const QString& incFile,fileIncludes->includeFiles.keys()) { + file->fileIncludes->includeFiles.insert(incFile,false); + } +// file->fileIncludes->includeFiles = +// file->fileIncludes->includeFiles.unite(fileIncludes->includeFiles); // file->fileIncludes->includeFiles.insert(fileIncludes->includeFiles); } } diff --git a/windows/templates/CL_Turtle_cpp.txt b/windows/templates/CL_Turtle_cpp.txt index 6b2f10d1..edcf6ff6 100644 --- a/windows/templates/CL_Turtle_cpp.txt +++ b/windows/templates/CL_Turtle_cpp.txt @@ -1,10 +1,14 @@ #include +#include int main() { int n; initWorld(800,600); setSpeed(1000); //setImmediate(1); + //init_console(); + //show_console(); + //printf("test output\n"); n=50; for (int i=0;i