maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #50855 from raulsntos/csharp-use-array-empty

Browse source 
Use `Array.Empty` instead of allocating a every time
This commit is contained in:
Ignacio Roldán Etcheverry 2021-07-26 04:41:29 +02:00 committed by GitHub
parent 8932b55011 accd05f4ad
commit f0de042aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View file

@ -76,9 +76,9 @@ namespace GodotTools.Export
GlobalDef("mono/export/aot/use_interpreter", true); GlobalDef("mono/export/aot/use_interpreter", true);
// --aot or --aot=opt1,opt2 (use 'mono --aot=help AuxAssembly.dll' to list AOT options) // --aot or --aot=opt1,opt2 (use 'mono --aot=help AuxAssembly.dll' to list AOT options)
GlobalDef("mono/export/aot/extra_aot_options", new string[] { }); GlobalDef("mono/export/aot/extra_aot_options", Array.Empty<string>());
// --optimize/-O=opt1,opt2 (use 'mono --list-opt'' to list optimize options) // --optimize/-O=opt1,opt2 (use 'mono --list-opt'' to list optimize options)
GlobalDef("mono/export/aot/extra_optimizer_options", new string[] { }); GlobalDef("mono/export/aot/extra_optimizer_options", Array.Empty<string>());
GlobalDef("mono/export/aot/android_toolchain_path", ""); GlobalDef("mono/export/aot/android_toolchain_path", "");
} }
@ -188,7 +188,7 @@ namespace GodotTools.Export
// However, at least in the case of 'WebAssembly.Net.Http' for some reason the BCL assemblies // However, at least in the case of 'WebAssembly.Net.Http' for some reason the BCL assemblies
// reference a different version even though the assembly is the same, for some weird reason. // reference a different version even though the assembly is the same, for some weird reason.
var wasmFrameworkAssemblies = new[] {"WebAssembly.Bindings", "WebAssembly.Net.WebSockets"}; var wasmFrameworkAssemblies = new[] { "WebAssembly.Bindings", "WebAssembly.Net.WebSockets" };
foreach (string thisWasmFrameworkAssemblyName in wasmFrameworkAssemblies) foreach (string thisWasmFrameworkAssemblyName in wasmFrameworkAssemblies)
{ {
@ -298,8 +298,8 @@ namespace GodotTools.Export
LLVMOutputPath = "", LLVMOutputPath = "",
FullAot = platform == OS.Platforms.iOS || (bool)(ProjectSettings.GetSetting("mono/export/aot/full_aot") ?? false), FullAot = platform == OS.Platforms.iOS || (bool)(ProjectSettings.GetSetting("mono/export/aot/full_aot") ?? false),
UseInterpreter = (bool)ProjectSettings.GetSetting("mono/export/aot/use_interpreter"), UseInterpreter = (bool)ProjectSettings.GetSetting("mono/export/aot/use_interpreter"),
ExtraAotOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_aot_options") ?? new string[] { }, ExtraAotOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_aot_options") ?? Array.Empty<string>(),
ExtraOptimizerOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options") ?? new string[] { }, ExtraOptimizerOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options") ?? Array.Empty<string>(),
ToolchainPath = aotToolchainPath ToolchainPath = aotToolchainPath
}; };
@ -381,7 +381,7 @@ namespace GodotTools.Export
private static bool PlatformHasTemplateDir(string platform) private static bool PlatformHasTemplateDir(string platform)
{ {
// OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest. // OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest.
return !new[] {OS.Platforms.MacOS, OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform); return !new[] { OS.Platforms.MacOS, OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5 }.Contains(platform);
} }
private static bool DeterminePlatformFromFeatures(IEnumerable<string> features, out string platform) private static bool DeterminePlatformFromFeatures(IEnumerable<string> features, out string platform)
@ -430,7 +430,7 @@ namespace GodotTools.Export
/// </summary> /// </summary>
private static bool PlatformRequiresCustomBcl(string platform) private static bool PlatformRequiresCustomBcl(string platform)
{ {
if (new[] {OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform)) if (new[] { OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5 }.Contains(platform))
return true; return true;
// The 'net_4_x' BCL is not compatible between Windows and the other platforms. // The 'net_4_x' BCL is not compatible between Windows and the other platforms.

8
modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
View file

@ -47,7 +47,7 @@ namespace GodotTools.Ides.Rider
GD.PushWarning(e.Message); GD.PushWarning(e.Message);
} }
return new RiderInfo[0]; return Array.Empty<RiderInfo>();
} }
private static RiderInfo[] CollectAllRiderPathsLinux() private static RiderInfo[] CollectAllRiderPathsLinux()
@ -249,7 +249,7 @@ namespace GodotTools.Ides.Rider
bool isMac) bool isMac)
{ {
if (!Directory.Exists(toolboxRiderRootPath)) if (!Directory.Exists(toolboxRiderRootPath))
return new string[0]; return Array.Empty<string>();
var channelDirs = Directory.GetDirectories(toolboxRiderRootPath); var channelDirs = Directory.GetDirectories(toolboxRiderRootPath);
var paths = channelDirs.SelectMany(channelDir => var paths = channelDirs.SelectMany(channelDir =>
@ -295,7 +295,7 @@ namespace GodotTools.Ides.Rider
Logger.Warn($"Failed to get RiderPath from {channelDir}", e); Logger.Warn($"Failed to get RiderPath from {channelDir}", e);
} }
return new string[0]; return Array.Empty<string>();
}) })
.Where(c => !string.IsNullOrEmpty(c)) .Where(c => !string.IsNullOrEmpty(c))
.ToArray(); .ToArray();
@ -306,7 +306,7 @@ namespace GodotTools.Ides.Rider
{ {
var folder = new DirectoryInfo(Path.Combine(buildDir, dirName)); var folder = new DirectoryInfo(Path.Combine(buildDir, dirName));
if (!folder.Exists) if (!folder.Exists)
return new string[0]; return Array.Empty<string>();
if (!isMac) if (!isMac)
return new[] { Path.Combine(folder.FullName, searchPattern) }.Where(File.Exists).ToArray(); return new[] { Path.Combine(folder.FullName, searchPattern) }.Where(File.Exists).ToArray();

14
modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
View file

@ -74,10 +74,10 @@ namespace GodotTools.Utils
} }
private static readonly IEnumerable<string> LinuxBSDPlatforms = private static readonly IEnumerable<string> LinuxBSDPlatforms =
new[] {Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD}; new[] { Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD };
private static readonly IEnumerable<string> UnixLikePlatforms = private static readonly IEnumerable<string> UnixLikePlatforms =
new[] {Names.MacOS, Names.Server, Names.Haiku, Names.Android, Names.iOS} new[] { Names.MacOS, Names.Server, Names.Haiku, Names.Android, Names.iOS }
.Concat(LinuxBSDPlatforms).ToArray(); .Concat(LinuxBSDPlatforms).ToArray();
private static readonly Lazy<bool> _isWindows = new Lazy<bool>(() => IsOS(Names.Windows)); private static readonly Lazy<bool> _isWindows = new Lazy<bool>(() => IsOS(Names.Windows));
@ -111,7 +111,7 @@ namespace GodotTools.Utils
private static string PathWhichWindows([NotNull] string name) private static string PathWhichWindows([NotNull] string name)
{ {
string[] windowsExts = Environment.GetEnvironmentVariable("PATHEXT")?.Split(PathSep) ?? new string[] { }; string[] windowsExts = Environment.GetEnvironmentVariable("PATHEXT")?.Split(PathSep) ?? Array.Empty<string>();
string[] pathDirs = Environment.GetEnvironmentVariable("PATH")?.Split(PathSep); string[] pathDirs = Environment.GetEnvironmentVariable("PATH")?.Split(PathSep);
var searchDirs = new List<string>(); var searchDirs = new List<string>();
@ -128,10 +128,10 @@ namespace GodotTools.Utils
return searchDirs.Select(dir => Path.Combine(dir, name)).FirstOrDefault(File.Exists); return searchDirs.Select(dir => Path.Combine(dir, name)).FirstOrDefault(File.Exists);
return (from dir in searchDirs return (from dir in searchDirs
select Path.Combine(dir, name) select Path.Combine(dir, name)
into path into path
from ext in windowsExts from ext in windowsExts
select path + ext).FirstOrDefault(File.Exists); select path + ext).FirstOrDefault(File.Exists);
} }
private static string PathWhichUnix([NotNull] string name) private static string PathWhichUnix([NotNull] string name)
@ -196,7 +196,7 @@ namespace GodotTools.Utils
startInfo.UseShellExecute = false; startInfo.UseShellExecute = false;
using (var process = new Process {StartInfo = startInfo}) using (var process = new Process { StartInfo = startInfo })
{ {
process.Start(); process.Start();
process.WaitForExit(); process.WaitForExit();

16
modules/mono/editor/bindings_generator.cpp
View file

@ -1737,7 +1737,12 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
cs_in_statements += " : "; cs_in_statements += " : ";
} }
String def_arg = sformat(iarg.default_argument, arg_type->cs_type); String cs_type = arg_type->cs_type;
if (cs_type.ends_with("[]")) {
cs_type = cs_type.substr(0, cs_type.length() - 2);
}
String def_arg = sformat(iarg.default_argument, cs_type);
cs_in_statements += def_arg; cs_in_statements += def_arg;
cs_in_statements += ";\n" INDENT3; cs_in_statements += ";\n" INDENT3;
@ -1746,8 +1751,10 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
// Apparently the name attribute must not include the @ // Apparently the name attribute must not include the @
String param_tag_name = iarg.name.begins_with("@") ? iarg.name.substr(1, iarg.name.length()) : iarg.name; String param_tag_name = iarg.name.begins_with("@") ? iarg.name.substr(1, iarg.name.length()) : iarg.name;
// Escape < and > in the attribute default value
String param_def_arg = def_arg.replacen("<", "&lt;").replacen(">", "&gt;");
default_args_doc.append(MEMBER_BEGIN "/// <param name=\"" + param_tag_name + "\">If the parameter is null, then the default value is " + def_arg + "</param>"); default_args_doc.append(MEMBER_BEGIN "/// <param name=\"" + param_tag_name + "\">If the parameter is null, then the default value is " + param_def_arg + "</param>");
} else { } else {
icall_params += arg_type->cs_in.is_empty() ? iarg.name : sformat(arg_type->cs_in, iarg.name); icall_params += arg_type->cs_in.is_empty() ? iarg.name : sformat(arg_type->cs_in, iarg.name);
} }
@ -3072,6 +3079,9 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
r_iarg.default_argument = "null"; r_iarg.default_argument = "null";
break; break;
case Variant::ARRAY: case Variant::ARRAY:
r_iarg.default_argument = "new %s { }";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF;
break;
case Variant::PACKED_BYTE_ARRAY: case Variant::PACKED_BYTE_ARRAY:
case Variant::PACKED_INT32_ARRAY: case Variant::PACKED_INT32_ARRAY:
case Variant::PACKED_INT64_ARRAY: case Variant::PACKED_INT64_ARRAY:
@ -3081,7 +3091,7 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
case Variant::PACKED_VECTOR2_ARRAY: case Variant::PACKED_VECTOR2_ARRAY:
case Variant::PACKED_VECTOR3_ARRAY: case Variant::PACKED_VECTOR3_ARRAY:
case Variant::PACKED_COLOR_ARRAY: case Variant::PACKED_COLOR_ARRAY:
r_iarg.default_argument = "new %s {}"; r_iarg.default_argument = "Array.Empty<%s>()";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF; r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF;
break; break;
case Variant::TRANSFORM2D: { case Variant::TRANSFORM2D: {