rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: Contents in class browser not correctly updated when close the last editor for project. 

- fix: When all editors closed, switch browser mode dosen't correct update the class browser;

  - stream line codes for project parser and  close browser
This commit is contained in:
Roy Qu 2022-11-07 11:24:23 +08:00
parent 63de2e72b1
commit fba7bd953c
8 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS.md
View File

@ -1,3 +1,8 @@
Red Panda C++ Version 2.4
- fix: Contents in class browser not correctly updated when close the last editor for project.
- fix: When all editors closed, switch browser mode dosen't correct update the class browser;
Red Panda C++ Version 2.3
- fix: When start parsing and exit app, app may crash

39
RedPandaIDE/mainwindow.cpp
View File

@ -1144,10 +1144,12 @@ void MainWindow::rebuildOpenedFileHisotryMenu()
void MainWindow::updateClassBrowserForEditor(Editor *editor)
{
if (mQuitting) {
mClassBrowserModel.beginUpdate();
mClassBrowserModel.setParser(nullptr);
mClassBrowserModel.setCurrentFile("");
mClassBrowserModel.setCurrentFiles(QStringList());
mClassBrowserModel.endUpdate();
return;
}
@ -1172,29 +1174,29 @@ void MainWindow::updateClassBrowserForEditor(Editor *editor)
mClassBrowserModel.setParser(editor->parser());
if (editor->inProject()) {
mClassBrowserModel.setClassBrowserType(mProject->options().classBrowserType);
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
} else {
mClassBrowserModel.setClassBrowserType(ProjectClassBrowserType::CurrentFile);
mClassBrowserModel.setCurrentFiles(QStringList());
}
mClassBrowserModel.setCurrentFile(editor->filename());
mClassBrowserModel.endUpdate();
} else if (mProject) {
if (mClassBrowserModel.parser() == mProject->cppParser()) {
mClassBrowserModel.beginUpdate();
mClassBrowserModel.setCurrentFile("");
mClassBrowserModel.endUpdate();
return;
}
mClassBrowserModel.beginUpdate();
mClassBrowserModel.setParser(mProject->cppParser());
mClassBrowserModel.setClassBrowserType(mProject->options().classBrowserType);
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
mClassBrowserModel.setCurrentFile("");
mClassBrowserModel.endUpdate();
} else {
mClassBrowserModel.beginUpdate();
mClassBrowserModel.setParser(nullptr);
mClassBrowserModel.setCurrentFile("");
mClassBrowserModel.setCurrentFiles(QStringList());
mClassBrowserModel.endUpdate();
return;
}
}
@ -3358,10 +3360,11 @@ void MainWindow::onClassBrowserContextMenu(const QPoint &pos)
menu.addAction(mClassBrowser_Sort_By_Type);
menu.addAction(mClassBrowser_Show_Inherited);
Editor * editor = mEditorList->getEditor();
if (editor) {
if ((editor &&editor->inProject()) || mProject) {
menu.addSeparator();
menu.addAction(mClassBrowser_Show_CurrentFile);
menu.addAction(mClassBrowser_Show_WholeProject);
if (mProject) {
mClassBrowser_Show_CurrentFile->setChecked(mProject->options().classBrowserType==ProjectClassBrowserType::CurrentFile);
mClassBrowser_Show_WholeProject->setChecked(mProject->options().classBrowserType==ProjectClassBrowserType::WholeProject);
@ -4201,7 +4204,7 @@ void MainWindow::onClassBrowserChangeScope()
mProject->options().classBrowserType=classBrowserType;
mProject->saveOptions();
Editor* editor = mEditorList->getEditor();
if (editor && editor->inProject() &&
if ((!editor || editor->inProject()) &&
mClassBrowserModel.classBrowserType()!=classBrowserType) {
mClassBrowserModel.setClassBrowserType(classBrowserType);
}
@ -6354,7 +6357,7 @@ void MainWindow::on_actionAdd_to_project_triggered()
PProjectModelNode folderNode = mProject->pointerToNode(node);
foreach (const QString& filename, dialog.selectedFiles()) {
PProjectUnit newUnit = mProject->addUnit(filename,folderNode);
mProject->cppParser()->addFileToScan(filename,true);
mProject->cppParser()->addProjectFile(filename,true);
QString branch;
if (pSettings->vcs().gitOk() && mProject->model()->iconProvider()->VCSRepository()->hasRepository(branch)) {
QString output;
@ -6372,7 +6375,6 @@ void MainWindow::on_actionAdd_to_project_triggered()
}
}
}
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
mProject->saveAll();
updateProjectView();
parseFileList(mProject->cppParser());
@ -6400,14 +6402,9 @@ void MainWindow::on_actionRemove_from_project_triggered()
if (!folderNode)
continue;
PProjectUnit unit = folderNode->pUnit.lock();
if (mProject->cppParser()) {
mProject->cppParser()->invalidateFile(unit->fileName());
mProject->cppParser()->removeProjectFile(unit->fileName());
}
mProject->removeUnit(unit, true, removeFile);
};
mClassBrowserModel.beginUpdate();
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
mClassBrowserModel.endUpdate();
ui->projectView->selectionModel()->clearSelection();
mProject->saveAll();
@ -6716,9 +6713,8 @@ void MainWindow::newProjectUnitFile()
setProjectViewCurrentUnit(newUnit);
mProject->saveAll();
if (mProject->cppParser())
mProject->cppParser()->addFileToScan(newFileName,true);
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
parseFileList(mProject->cppParser());
Editor * editor = mProject->openUnit(newUnit, false);
if (editor)
editor->activate();
@ -6848,7 +6844,6 @@ QString MainWindow::switchHeaderSourceTarget(Editor *editor)
void MainWindow::onProjectViewNodeRenamed()
{
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
updateProjectView();
}
@ -7964,9 +7959,6 @@ void MainWindow::on_actionNew_Header_triggered()
PProjectUnit newUnit=mProject->addUnit(headerFilename,mProject->rootNode());
mProject->saveAll();
mProject->cppParser()->addFileToScan(headerFilename,true);
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
parseFileList(mProject->cppParser());
setProjectViewCurrentUnit(newUnit);
updateProjectView();
@ -8044,11 +8036,6 @@ void MainWindow::on_actionNew_Class_triggered()
newUnit=mProject->addUnit(sourceFilename,mProject->rootNode());
setProjectViewCurrentUnit(newUnit);
mProject->saveAll();
mProject->cppParser()->addFileToScan(sourceFilename,true);
mProject->cppParser()->addFileToScan(headerFilename,true);
mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
parseFileList(mProject->cppParser());
updateProjectView();

14
RedPandaIDE/parser/cppparser.cpp
View File

@ -1121,18 +1121,17 @@ int CppParser::getFirstTemplateParamEnd(const QString &s, int startAt)
return startAt;
}
void CppParser::addFileToScan(const QString& value, bool inProject)
void CppParser::addProjectFile(const QString &fileName, bool needScan)
{
QMutexLocker locker(&mMutex);
//value.replace('/','\\'); // only accept full file names
// Update project listing
if (inProject)
mProjectFiles.insert(value);
mProjectFiles.insert(fileName);
// Only parse given file
if (!mPreprocessor.scannedFiles().contains(value)) {
mFilesToScan.insert(value);
if (needScan && !mPreprocessor.scannedFiles().contains(fileName)) {
mFilesToScan.insert(fileName);
}
}
@ -5273,6 +5272,11 @@ void CppParser::parseCommandTypeAndArgs(QString &command, QString &typeSuffix, Q
}
const QSet<QString> &CppParser::projectFiles() const
{
return mProjectFiles;
}
ParserLanguage CppParser::language() const
{
return mLanguage;

4
RedPandaIDE/parser/cppparser.h
View File

@ -34,7 +34,7 @@ public:
~CppParser();
void addHardDefineByLine(const QString& line);
void addFileToScan(const QString& value, bool inProject = false);
void addProjectFile(const QString &fileName, bool needScan);
void addIncludePath(const QString& value);
void removeProjectFile(const QString& value);
void addProjectIncludePath(const QString& value);
@ -143,6 +143,8 @@ public:
ParserLanguage language() const;
void setLanguage(ParserLanguage newLanguage);
const QSet<QString> &projectFiles() const;
signals:
void onProgress(const QString& fileName, int total, int current);
void onBusy();

45
RedPandaIDE/project.cpp
View File

@ -526,6 +526,18 @@ void Project::rebuildNodes()
}
bool Project::removeUnit(PProjectUnit& unit, bool doClose , bool removeFile)
{
bool result=internalRemoveUnit(unit,doClose,removeFile);
if (result) {
mParser->invalidateFile(unit->fileName());
mParser->removeProjectFile(unit->fileName());
emit unitRemoved(unit->fileName());
}
return result;
}
bool Project::internalRemoveUnit(PProjectUnit& unit, bool doClose , bool removeFile)
{
if (!unit)
return false;
@ -609,7 +621,7 @@ void Project::resetParserProjectFiles()
mParser->clearProjectFiles();
mParser->clearProjectIncludePaths();
foreach (const PProjectUnit& unit, mUnits) {
mParser->addFileToScan(unit->fileName(),true);
mParser->addProjectFile(unit->fileName(),true);
}
foreach (const QString& s, mOptions.includeDirs) {
mParser->addProjectIncludePath(s);
@ -693,32 +705,37 @@ void Project::saveLayout()
}
}
void Project::renameUnit(PProjectUnit& unit, const QString &sFileName)
void Project::renameUnit(PProjectUnit& unit, const QString &newFileName)
{
if (!unit)
return;
if (sFileName.compare(unit->fileName(),PATH_SENSITIVITY)==0)
if (newFileName.compare(unit->fileName(),PATH_SENSITIVITY)==0)
return;
if (mParser) {
mParser->removeProjectFile(unit->fileName());
mParser->addFileToScan(sFileName,true);
mParser->addProjectFile(newFileName,true);
}
Editor * editor=unitEditor(unit);
if (editor) {
//prevent recurse
editor->saveAs(sFileName,true);
editor->saveAs(newFileName,true);
} else {
if (mParser)
mParser->invalidateFile(unit->fileName());
copyFile(unit->fileName(),sFileName,true);
copyFile(unit->fileName(),newFileName,true);
if (mParser)
mParser->parseFile(sFileName,true);
mParser->parseFile(newFileName,true);
}
removeUnit(unit,false,true);
internalRemoveUnit(unit,false,true);
PProjectModelNode parentNode = unit->node()->parent.lock();
unit = addUnit(sFileName,parentNode);
internalAddUnit(newFileName,parentNode);
setModified(true);
emit unitRenamed(unit->fileName(),newFileName);
emit nodeRenamed();
}
@ -1202,6 +1219,16 @@ PProjectModelNode Project::addFolder(PProjectModelNode parentFolder,const QStrin
}
PProjectUnit Project::addUnit(const QString &inFileName, PProjectModelNode parentNode)
{
PProjectUnit newUnit=internalAddUnit(inFileName, parentNode);
if (newUnit) {
mParser->addProjectFile(newUnit->fileName(),true);
emit unitAdded(newUnit->fileName());
}
return newUnit;
}
PProjectUnit Project::internalAddUnit(const QString &inFileName, PProjectModelNode parentNode)
{
// Don't add if it already exists
if (fileAlreadyExists(inFileName)) {

7
RedPandaIDE/project.h
View File

@ -290,10 +290,17 @@ public:
void renameFolderNode(PProjectModelNode node, const QString newName);
void loadUnitLayout(Editor *e);
signals:
void unitRemoved(const QString& fileName);
void unitAdded(const QString& fileName);
void unitRenamed(const QString& oldFileName, const QString& newFileName);
void nodeRenamed();
void modifyChanged(bool value);
private:
bool internalRemoveUnit(PProjectUnit& unit, bool doClose, bool removeFile);
PProjectUnit internalAddUnit(const QString& inFileName,
PProjectModelNode parentNode);
bool assignTemplate(const std::shared_ptr<ProjectTemplate> aTemplate, bool useCpp);
void checkProjectFileForUpdate(SimpleIni& ini);
void createFolderNodes();

14
RedPandaIDE/widgets/classbrowser.cpp
View File

@ -278,9 +278,9 @@ void ClassBrowserModel::addMembers()
return;
filterChildren(mRoot,p->statements);
} else {
if (mCurrentFiles.isEmpty())
if (mParser->projectFiles().isEmpty())
return;
foreach(const QString& file,mCurrentFiles) {
foreach(const QString& file,mParser->projectFiles()) {
PFileIncludes p = mParser->findFileIncludes(file);
if (!p)
return;
@ -427,16 +427,6 @@ ClassBrowserNode* ClassBrowserModel::getParentNode(const PStatement &parentState
return parentNode.get();
}
const QStringList &ClassBrowserModel::currentFiles() const
{
return mCurrentFiles;
}
void ClassBrowserModel::setCurrentFiles(const QStringList &newCurrentFiles)
{
mCurrentFiles = newCurrentFiles;
}
QModelIndex ClassBrowserModel::modelIndexForStatement(const QString &key)
{
QMutexLocker locker(&mMutex);

4
RedPandaIDE/widgets/classbrowser.h
View File

@ -62,9 +62,6 @@ public:
ProjectClassBrowserType classBrowserType() const;
void setClassBrowserType(ProjectClassBrowserType newClassBrowserType);
const QStringList &currentFiles() const;
void setCurrentFiles(const QStringList &newCurrentFiles);
QModelIndex modelIndexForStatement(const QString& key);
signals:
void refreshStarted();
@ -90,7 +87,6 @@ private:
int mUpdateCount;
QMutex mMutex;
QString mCurrentFile;
QStringList mCurrentFiles;
std::shared_ptr<QHash<StatementKind, std::shared_ptr<ColorSchemeItem> > > mColors;
ProjectClassBrowserType mClassBrowserType;