Try Workaround for launching VS and add open with VS (3)

hicknhack-software · Mar 8, 2024 · c6e44d8 · c6e44d8
1 parent cef3b7d
commit c6e44d8
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 12 deletions.
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -375,6 +375,7 @@ EditorManagerPrivate::EditorManagerPrivate(QObject *parent) :
     m_openGraphicalShellContextAction(new QAction(FileUtils::msgGraphicalShellAction(), this)),
     m_showInFileSystemViewContextAction(new QAction(FileUtils::msgFileSystemAction(), this)),
     m_openTerminalAction(new QAction(FileUtils::msgTerminalHereAction(), this)),
+    m_openVisualStudioAction(new QAction(::Core::Tr::tr("Open With Visual Studio"), this)),
     m_findInDirectoryAction(new QAction(FileUtils::msgFindInDirectory(), this)),
     m_filePropertiesAction(new QAction(::Core::Tr::tr("Properties..."), this)),
     m_pinAction(new QAction(::Core::Tr::tr("Pin"), this))
@@ -549,6 +550,11 @@ void EditorManagerPrivate::init()
         FileUtils::showInFileSystemView(m_contextMenuEntry->filePath());
     });
     connect(m_openTerminalAction, &QAction::triggered, this, &EditorManagerPrivate::openTerminal);
+    connect(m_openVisualStudioAction, &QAction::triggered, this, [this]() {
+        if (!d->m_contextMenuEntry || d->m_contextMenuEntry->filePath().isEmpty())
+            return;
+        EditorManager::instance()->openWithVisualStudio(d->m_contextMenuEntry->filePath());
+    });
     connect(m_findInDirectoryAction, &QAction::triggered,
             this, &EditorManagerPrivate::findInDirectory);
     connect(m_filePropertiesAction, &QAction::triggered, this, [this] {
@@ -2803,11 +2809,15 @@ void EditorManager::addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentM
     d->m_openGraphicalShellContextAction->setEnabled(enabled);
     d->m_showInFileSystemViewContextAction->setEnabled(enabled);
     d->m_openTerminalAction->setEnabled(enabled);
+    d->m_openVisualStudioAction->setEnabled(enabled);
     d->m_findInDirectoryAction->setEnabled(enabled);
     d->m_filePropertiesAction->setEnabled(enabled);
     contextMenu->addAction(d->m_openGraphicalShellContextAction);
     contextMenu->addAction(d->m_showInFileSystemViewContextAction);
     contextMenu->addAction(d->m_openTerminalAction);
+    if (HostOsInfo::isWindowsHost()) {
+        contextMenu->addAction(d->m_openVisualStudioAction);
+    }
     contextMenu->addAction(d->m_findInDirectoryAction);
     contextMenu->addAction(d->m_filePropertiesAction);
     QMenu *openWith = contextMenu->addMenu(::Core::Tr::tr("Open With"));

diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -167,6 +167,8 @@ class CORE_EXPORT EditorManager : public QObject
     void autoSaved();
     void currentEditorAboutToChange(Core::IEditor *editor);
 
+    void openWithVisualStudio(const Utils::FilePath &path);
+
 #ifdef WITH_TESTS
     void linkOpened();
 #endif

diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -232,6 +232,7 @@ public slots:
     QAction *m_showInFileSystemViewAction = nullptr;
     QAction *m_showInFileSystemViewContextAction = nullptr;
     QAction *m_openTerminalAction = nullptr;
+    QAction *m_openVisualStudioAction = nullptr;
     QAction *m_findInDirectoryAction = nullptr;
     QAction *m_filePropertiesAction = nullptr;
     QAction *m_pinAction = nullptr;

diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -67,6 +67,33 @@ static QbsProject *currentEditorProject()
     return doc ? qobject_cast<QbsProject *>(ProjectManager::projectForFile(doc->filePath())) : nullptr;
 }
 
+static void windowsStartProcessDetached(FilePath appPath, QStringList args) {
+    // note: QProcess cannot launch devenv.exe correctly. Default escape codes don't work here
+#if defined(Q_OS_WIN)
+    auto startupInfo = STARTUPINFOW{.cb = sizeof(STARTUPINFOW)};
+    auto processInfo = PROCESS_INFORMATION{};
+
+    auto cmdLine = QString{appPath.fileName() + ' ' + args.join(" ")};
+
+    CreateProcessW(reinterpret_cast<const wchar_t *>(appPath.nativePath().utf16()),
+                   reinterpret_cast<wchar_t *>(const_cast<ushort *>(cmdLine.utf16())),
+                   nullptr, // process attributes
+                   nullptr, // thread attributes
+                   false, // inherit handles
+                   DETACHED_PROCESS,
+                   nullptr, // environment
+                   nullptr, // current directory
+                   &startupInfo,
+                   &processInfo);
+
+    CloseHandle(processInfo.hProcess);
+    CloseHandle(processInfo.hThread);
+#else
+    (void)appPath;
+    (void)args;
+#endif
+}
+
 class QbsProjectManagerPluginPrivate
 {
 public:
@@ -206,6 +233,19 @@ void QbsProjectManagerPlugin::initialize()
     connect(m_reparseQbs, &QAction::triggered,
             this, &QbsProjectManagerPlugin::reparseCurrentProject);
 
+    connect(Core::EditorManager::instance(), &Core::EditorManager::openWithVisualStudio, this, [this](const Utils::FilePath &path) {
+        RunConfiguration* rc = ProjectManager::startupRunConfiguration();
+        if (!rc)
+            return;
+
+        if (const auto envAspect = rc->aspect<EnvironmentAspect>()) {
+            const auto devEnv = envAspect->environment().searchInPath(QLatin1String("devenv.exe"));
+            if (devEnv.isEmpty())
+                return;
+            windowsStartProcessDetached(devEnv, QStringList{} << "/edit" << QStringLiteral("\"%1\"").arg(path.nativePath()));
+        }
+    });
+
     m_reparseQbsCtx = new QAction(Tr::tr("Reparse Qbs"), this);
     command = Core::ActionManager::registerAction(m_reparseQbsCtx, Constants::ACTION_REPARSE_QBS_CONTEXT, projectContext);
     command->setAttribute(Core::Command::CA_Hide);
@@ -497,15 +537,7 @@ void QbsProjectManagerPlugin::generateVs2022Project()
 
 void QbsProjectManagerPlugin::debugWithVs2022Project()
 {
-    Project *project = ProjectManager::startupProject();
-    if (!project)
-        return;
-
-    Target *target = project->activeTarget();
-    if (!target)
-        return;
-
-    RunConfiguration* rc = target->activeRunConfiguration();
+    RunConfiguration* rc = ProjectManager::startupRunConfiguration();
     if (!rc)
         return;
 
@@ -538,9 +570,7 @@ void QbsProjectManagerPlugin::debugWithVs2022Project()
     if (const auto envAspect = rc->aspect<EnvironmentAspect>()) {
         const auto devEnv = envAspect->environment().searchInPath(QLatin1String("devenv.exe"));
         if (!devEnv.isEmpty()) {
-            QStringList params;
-            params << QDir::toNativeSeparators(solutionName);
-            QProcess::startDetached(devEnv.toString(), params);
+            windowsStartProcessDetached(devEnv, QStringList{} << QStringLiteral("\"%1\"").arg(QDir::toNativeSeparators(solutionName)));
         }
     }
 }