GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code style fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-18 12:21:12 +02:00
parent 4fe02a24e9
commit 960b825b4c
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
View File

@@ -24,7 +24,8 @@ namespace
String version; String version;
RiderInstallation(const String& path_, const String& version_) RiderInstallation(const String& path_, const String& version_)
: path(path_), version(version_) : path(path_)
, version(version_)
{ {
} }
}; };
@@ -145,14 +146,14 @@ bool sortInstallations(RiderInstallation* const& i1, RiderInstallation* const& i
int32 version2[3] = { 0 }; int32 version2[3] = { 0 };
StringUtils::Parse(values1[0].Get(), &version1[0]); StringUtils::Parse(values1[0].Get(), &version1[0]);
StringUtils::Parse(values1[1].Get(), &version1[1]); StringUtils::Parse(values1[1].Get(), &version1[1]);
if(values1.Count() > 2) if (values1.Count() > 2)
StringUtils::Parse(values1[2].Get(), &version1[2]); StringUtils::Parse(values1[2].Get(), &version1[2]);
StringUtils::Parse(values2[0].Get(), &version2[0]); StringUtils::Parse(values2[0].Get(), &version2[0]);
StringUtils::Parse(values2[1].Get(), &version2[1]); StringUtils::Parse(values2[1].Get(), &version2[1]);
if(values2.Count() > 2) if (values2.Count() > 2)
StringUtils::Parse(values2[2].Get(), &version2[2]); StringUtils::Parse(values2[2].Get(), &version2[2]);
// Compare by MAJOR.MINOR.BUILD // Compare by MAJOR.MINOR.BUILD
@@ -178,7 +179,7 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
String localAppDataPath; String localAppDataPath;
FileSystem::GetSpecialFolderPath(SpecialFolder::LocalAppData, localAppDataPath); FileSystem::GetSpecialFolderPath(SpecialFolder::LocalAppData, localAppDataPath);
#if PLATFORM_WINDOWS #if PLATFORM_WINDOWS
// Lookup from all known registry locations // Lookup from all known registry locations
SearchRegistry(&installations, HKEY_CURRENT_USER, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\Rider for Unreal Engine")); SearchRegistry(&installations, HKEY_CURRENT_USER, TEXT("SOFTWARE\\WOW6432Node\\JetBrains\\Rider for Unreal Engine"));
@@ -219,21 +220,21 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
#if PLATFORM_MAC #if PLATFORM_MAC
String applicationSupportFolder; String applicationSupportFolder;
FileSystem::GetSpecialFolderPath(SpecialFolder::ProgramData, applicationSupportFolder); FileSystem::GetSpecialFolderPath(SpecialFolder::ProgramData, applicationSupportFolder);
Array<String> subMacDirectories;
Array<String> subMacDirectories;
FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-0/")); FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-0/"));
FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-1/")); FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-1/"));
for (const String& directory : subMacDirectories)
for (auto directory : subMacDirectories) { {
String riderAppDirectory = directory / TEXT("Rider.app/Contents/Resources"); String riderAppDirectory = directory / TEXT("Rider.app/Contents/Resources");
SearchDirectory(&installations, riderAppDirectory); SearchDirectory(&installations, riderAppDirectory);
} }
// Check the local installer version // Check the local installer version
SearchDirectory(&installations, TEXT("/Applications/Rider.app/Contents/Resources")); SearchDirectory(&installations, TEXT("/Applications/Rider.app/Contents/Resources"));
#endif #endif
for (auto directory : subDirectories) for (const String& directory : subDirectories)
SearchDirectory(&installations, directory); SearchDirectory(&installations, directory);
// Sort found installations by version number // Sort found installations by version number