From ba266f74edbd5e0ac1bd6f3eb4678e22a642c6cc Mon Sep 17 00:00:00 2001
From: GoaLitiuM <goalitium@kapsi.fi>
Date: Sat, 17 Jul 2021 21:17:49 +0300
Subject: [PATCH 1/2] Improve detection of Rider installed via JetBrains
 Toolbox

---
 .../Editor/Scripting/CodeEditors/RiderCodeEditor.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
index 2c5265a06..fe6022a8e 100644
--- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
@@ -163,10 +163,18 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
 #if PLATFORM_WINDOWS
     Array<RiderInstallation*> installations;
 
-    // For versions 2021 or later
+    // Versions installed via JetBrains Toolbox
+    String localAppDataPath;
+    Array<String> subDirectories;
+    FileSystem::GetSpecialFolderPath(SpecialFolder::LocalAppData, localAppDataPath);
+    FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("JetBrains\\Toolbox\\apps\\Rider\\ch-0\\"));
+    for (auto directory : subDirectories)
+        SearchDirectory(&installations, directory);
+
+    // Versions 2021 or later
     SearchRegistry(&installations, HKEY_CURRENT_USER, TEXT("SOFTWARE\\JetBrains\\Rider"), TEXT("InstallDir"));
 
-    // For versions 2020 or earlier
+    // Versions 2020 or earlier
     SearchRegistry(&installations, HKEY_CURRENT_USER, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\JetBrains Rider"));
     SearchRegistry(&installations, HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\JetBrains Rider"));
 

From 681c45dcbe091402941bf3f701e095decbe3ef66 Mon Sep 17 00:00:00 2001
From: GoaLitiuM <goalitium@kapsi.fi>
Date: Sat, 17 Jul 2021 21:18:09 +0300
Subject: [PATCH 2/2] Support Rider for Unreal Engine

---
 Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
index fe6022a8e..a095b65fd 100644
--- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
@@ -171,6 +171,9 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
     for (auto directory : subDirectories)
         SearchDirectory(&installations, directory);
 
+    // Rider for Unreal Engine
+    SearchRegistry(&installations, HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\Rider for Unreal Engine"));
+
     // Versions 2021 or later
     SearchRegistry(&installations, HKEY_CURRENT_USER, TEXT("SOFTWARE\\JetBrains\\Rider"), TEXT("InstallDir"));