feat: [generator] optimized project generator and open project

Log: as title

src/plugins/builder/mainframe/buildmanager.cpp

@@ -26,6 +26,7 @@
 #include <DGuiApplicationHelper>
 #include <DComboBox>
 #include <DFrame>
+#include <DDialog>
 
 #include <QSplitter>
 #include <QCoreApplication>
@@ -391,6 +392,9 @@ void BuildManager::execBuildStep(QList<BuildMenuType> menuTypelist)
  list.append(info);
  }
  execCommands(list, false);
+ } else {
+ auto windowService = dpfGetService(WindowService);
+ windowService->notify(1, tr("Warning"), tr("The project does not have an associated build kit. Please reopen the project and select the corresponding build tool."), {});
  }
  }
 }

src/plugins/cxx/ninja/project/ninjaprojectgenerator.cpp

@@ -3,29 +3,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "ninjaprojectgenerator.h"
-#include "ninjaasynparse.h"
 
 #include "common/dialog/propertiesdialog.h"
 #include "services/window/windowservice.h"
 #include "services/builder/builderservice.h"
 #include "services/option/optionmanager.h"
 
-#include <QtConcurrent>
-#include <QtXml>
-#include <QFileIconProvider>
-
-class NinjaProjectGeneratorPrivate
-{
- friend class NinjaProjectGenerator;
- QStandardItem* configureRootItem {nullptr};
- QMenu *ninjaMenu {nullptr};
- QProcess *menuGenProcess {nullptr};
- QHash<QStandardItem*, NinjaAsynParse*> projectParses {};
- dpfservice::ProjectInfo prjInfo;
-};
-
 NinjaProjectGenerator::NinjaProjectGenerator()
- : d(new NinjaProjectGeneratorPrivate())
 {
  qRegisterMetaType<QList<QStandardItem*>>("QList<QStandardItem*>");
  using namespace dpfservice;
@@ -40,9 +24,6 @@ NinjaProjectGenerator::NinjaProjectGenerator()
 NinjaProjectGenerator::~NinjaProjectGenerator()
 {
  qInfo() << __FUNCTION__;
-
- if (d)
- delete d;
 }
 
 QStringList NinjaProjectGenerator::supportLanguages()
@@ -55,87 +36,8 @@ QStringList NinjaProjectGenerator::supportFileNames()
  return {"build.ninja"};
 }
 
-DWidget *NinjaProjectGenerator::configureWidget(const QString &language,
- const QString &projectPath)
-{
- d->prjInfo.setLanguage(language);
- d->prjInfo.setKitName(NinjaProjectGenerator::toolKitName());
- d->prjInfo.setWorkspaceFolder(projectPath);
-
- return nullptr;
-}
-
-void NinjaProjectGenerator::acceptConfigure()
-{
- configure(d->prjInfo);
-}
-
-bool NinjaProjectGenerator::configure(const dpfservice::ProjectInfo &info)
-{
- dpfservice::ProjectGenerator::configure(info);
-
- auto root = createRootItem(info);
- using namespace dpfservice;
- auto &ctx = dpfInstance.serviceContext();
- ProjectService *projectService = ctx.service<ProjectService>(ProjectService::name());
- if (projectService && root) {
- projectService->addRootItem(root);
- projectService->expandedDepth(root, 1);
- }
-
- dpfservice::ProjectGenerator::configure(info);
-
- return true;
-}
-
-QStandardItem *NinjaProjectGenerator::createRootItem(const dpfservice::ProjectInfo &info)
-{
- using namespace dpfservice;
- QStandardItem * rootItem = ProjectGenerator::createRootItem(info);
- dpfservice::ProjectInfo::set(rootItem, info);
- d->projectParses[rootItem] = new NinjaAsynParse();
- QObject::connect(d->projectParses[rootItem], &NinjaAsynParse::itemsModified,
- this, &NinjaProjectGenerator::doProjectChildsModified);
- QMetaObject::invokeMethod(d->projectParses[rootItem], "parseProject",
- Q_ARG(const dpfservice::ProjectInfo &, info));
- return rootItem;
-}
-
-void NinjaProjectGenerator::removeRootItem(QStandardItem *root)
-{
- if (!root)
- return;
- auto parser = d->projectParses[root];
-
- while (root->hasChildren()) {
- root->takeRow(0);
- }
- d->projectParses.remove(root);
-
- delete root;
-
- if (parser)
- delete parser;
-}
-
 QMenu *NinjaProjectGenerator::createItemMenu(const QStandardItem *item)
 {
  Q_UNUSED(item)
  return nullptr;
 }
-
-void NinjaProjectGenerator::doProjectChildsModified(const QList<QStandardItem *> &items)
-{
- auto rootItem = d->projectParses.key(qobject_cast<NinjaAsynParse*>(sender()));
- if (rootItem) {
- while (rootItem->hasChildren()) {
- rootItem->takeRow(0);
- }
- for (auto &item : items) {
- item->setIcon(CustomIcons::icon(item->toolTip()));
- }
-
- rootItem->appendRows(items);
- }
- rootItem->setData(ParsingState::Done, Parsing_State_Role);
-}

src/plugins/cxx/ninja/project/ninjaprojectgenerator.h

@@ -5,33 +5,23 @@
 #ifndef NINJAPROJECTGENERATOR_H
 #define NINJAPROJECTGENERATOR_H
 
-#include "ninjaasynparse.h"
 #include "services/project/projectservice.h"
+#include "services/project/directorygenerator.h"
 
 #include <QObject>
 #include <QDomDocument>
 
-class NinjaProjectGeneratorPrivate;
-class NinjaProjectGenerator : public dpfservice::ProjectGenerator
+class NinjaProjectGenerator : public dpfservice::DirectoryGenerator
 {
  Q_OBJECT
- NinjaProjectGeneratorPrivate *const d;
 public:
  explicit NinjaProjectGenerator();
  virtual ~NinjaProjectGenerator() override;
  static QString toolKitName() { return "ninja"; }
+ virtual QString configureKitName() { return "ninja"; }
  virtual QStringList supportLanguages() override;
  virtual QStringList supportFileNames() override;
- virtual DWidget* configureWidget(const QString &language,
- const QString &projectPath) override;
- virtual void acceptConfigure() override;
- virtual bool configure(const dpfservice::ProjectInfo &info = {}) override;
- virtual QStandardItem *createRootItem(const dpfservice::ProjectInfo &info) override;
- virtual void removeRootItem(QStandardItem* root) override;
  virtual QMenu* createItemMenu(const QStandardItem *item) override;
-
-private slots:
- void doProjectChildsModified(const QList<QStandardItem*> &items);
 };
 
 #endif // NINJAPROJECTGENERATOR_H

src/plugins/debugger/debugmanager.cpp

@@ -10,6 +10,7 @@
 #include "interface/attachinfodialog.h"
 
 #include "services/debugger/debuggerservice.h"
+#include "services/window/windowservice.h"
 #include "services/language/languageservice.h"
 #include "services/editor/editorservice.h"
 #include "common/util/custompaths.h"
@@ -105,6 +106,9 @@ void DebugManager::run()
  currentDebugger = debuggers[debugger];
  connect(currentDebugger, &AbstractDebugger::runStateChanged, this, &DebugManager::handleRunStateChanged);
  }
+ } else {
+ auto windowService = dpfGetService(WindowService);
+ windowService->notify(1, tr("Warning"), tr("The project does not have an associated build kit. Please reopen the project and select the corresponding build tool."), {});
  }
  }
  AsynInvoke(currentDebugger->startDebug());

src/plugins/debugger/runner/runner.cpp

@@ -18,6 +18,7 @@
 
 #include <DComboBox>
 #include <DGuiApplicationHelper>
+#include <DDialog>
 
 #include <QMenu>
 #include <QTextBlock>
@@ -100,6 +101,9 @@ void Runner::run()
  } else {
  running();
  }
+ } else {
+ auto windowService = dpfGetService(WindowService);
+ windowService->notify(1, tr("Warning"), tr("The project does not have an associated build kit. Please reopen the project and select the corresponding build tool."), {});
  }
  }
 }

src/plugins/javascript/CMakeLists.txt

@@ -8,7 +8,6 @@ set(javascript_CPP
  javascriptplugin.cpp
  jsgenerator.cpp
  javascriptplugin.json
- project/jsasynparse.cpp
  project/jsprojectgenerator.cpp
  project/properties/configpropertywidget.cpp
  project/properties/configutil.cpp
@@ -18,7 +17,6 @@ set(javascript_CPP
 set(javascript_H
  javascriptplugin.h
  jsgenerator.h
- project/jsasynparse.h
  project/jsprojectgenerator.h
  project/properties/configpropertywidget.h
  project/properties/configutil.h

src/plugins/javascript/jsgenerator.cpp

@@ -45,7 +45,7 @@ bool JSGenerator::requestDAPPort(const QString &ppid, const QMap<QString, QVaria
 {
  QString targetPath = param.value("targetPath").toString();
  QStringList arguments = param.value("arguments").toStringList();
- QString kit = "jsdirectory";
+ QString kit = "javascript";
 
  QDBusMessage msg = QDBusMessage::createSignal("/path",
  "com.deepin.unioncode.interface",

src/plugins/javascript/jsgenerator.h

@@ -16,7 +16,7 @@ class JSGenerator : public dpfservice::LanguageGenerator
  explicit JSGenerator();
  virtual ~JSGenerator() override;
 
- static QString toolKitName() { return "jsdirectory"; }
+ static QString toolKitName() { return "javascript"; }
 
  QString debugger() override;
  bool prepareDebug(const QMap<QString, QVariant> &param, QString &retMsg) override;