Supports opening files with command line args

Author: CrSjimo

src/plugins/coreplugin/internal/CorePlugin.cpp

@@ -133,26 +133,43 @@ namespace Core::Internal {
     static constexpr char kNewProjectArg[] = "--new";
 
     static ActionWindowInterfaceBase *initializeGui(const QStringList &options, const QString &workingDirectory, const QStringList &args) {
+        qCDebug(lcCorePlugin) << "Initializing GUI" << options << args;
         if (options.contains(kOpenSettingsArg)) {
             qCInfo(lcCorePlugin) << "Open settings dialog with command line args";
             CoreInterface::execSettingsDialog("", nullptr);
         }
-        ActionWindowInterfaceBase *windowInterface;
-        if (options.contains(kNewProjectArg) || (BehaviorPreference::startupBehavior() & BehaviorPreference::SB_CreateNewProject)) {
-            qCInfo(lcCorePlugin) << "Create new project on startup";
-            windowInterface = CoreInterface::newFile();
-        } else {
-            qCInfo(lcCorePlugin) << "Open home window on startup";
-            CoreInterface::showHome();
-            windowInterface = HomeWindowInterface::instance();
-        }
-        auto win = windowInterface->window();
-        if (win->visibility() == QWindow::Minimized) {
-            win->showNormal();
+        QList<ActionWindowInterfaceBase *> windowInterfaceList;
+        do {
+            if (!args.isEmpty()) {
+                for (const auto &arg : args) {
+                    auto filePath = QDir(workingDirectory).absoluteFilePath(arg);
+                    auto windowInterface = CoreInterface::openFile(filePath);
+                    if (windowInterface) {
+                        windowInterfaceList.append(windowInterface);
+                    }
+                }
+                if (!windowInterfaceList.isEmpty()) {
+                    break;
+                }
+            }
+            if (options.contains(kNewProjectArg) || (BehaviorPreference::startupBehavior() & BehaviorPreference::SB_CreateNewProject)) {
+                qCInfo(lcCorePlugin) << "Create new project on startup";
+                windowInterfaceList.append(CoreInterface::newFile());
+            } else {
+                qCInfo(lcCorePlugin) << "Open home window on startup";
+                CoreInterface::showHome();
+                windowInterfaceList.append(HomeWindowInterface::instance());
+            }
+        } while (false);
+        for (auto windowInterface : windowInterfaceList) {
+            auto win = windowInterface->window();
+            if (win->visibility() == QWindow::Minimized) {
+                win->showNormal();
+            }
+            win->raise();
+            win->requestActivate();
         }
-        win->raise();
-        win->requestActivate();
-        return windowInterface;
+        return windowInterfaceList.first();
     }
 
     bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) {
@@ -189,7 +206,7 @@ namespace Core::Internal {
         qCInfo(lcCorePlugin) << "Initializing GUI";
         // TODO plugin arguments
         auto args = QApplication::arguments();
-        auto windowInterface = initializeGui(args, QDir::currentPath(), args);
+        auto windowInterface = initializeGui(args, QDir::currentPath(), ExtensionSystem::PluginManager::arguments());
         auto win = windowInterface->window();
         class ExposedListener : public QObject {
         public: