From f319e9f23457914b4703590ac91538ef9fe2bd06 Mon Sep 17 00:00:00 2001 From: Walrusking Date: Fri, 15 Sep 2023 01:31:33 -0400 Subject: [PATCH 1/2] Fixes Rider 2022 not detected when installed with toolbox --- Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp index e28d1e381..eb36e9549 100644 --- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp +++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp @@ -187,6 +187,7 @@ void RiderCodeEditor::FindEditors(Array* output) SearchRegistry(&installations, HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\JetBrains Rider")); // Versions installed via JetBrains Toolbox + FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("Programs")); FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("JetBrains\\Toolbox\\apps\\Rider\\ch-0\\")); FileSystem::GetChildDirectories(subDirectories, localAppDataPath / TEXT("JetBrains\\Toolbox\\apps\\Rider\\ch-1\\")); // Beta versions #endif From 425d625aa726a68feebf853d37ee4366907b163c Mon Sep 17 00:00:00 2001 From: Walrusking Date: Sat, 16 Sep 2023 13:48:49 -0400 Subject: [PATCH 2/2] Fix rider search detecting any jetbrains product as rider --- Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp index eb36e9549..d66b5bc50 100644 --- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp +++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp @@ -44,6 +44,10 @@ namespace if (document.HasParseError()) return; + // Check if this is actually rider and not another jetbrains product + if (document.FindMember("name")->value != "JetBrains Rider") + return; + // Find version auto versionMember = document.FindMember("version"); if (versionMember == document.MemberEnd())