Simplify 'default' expression (IDE0034)
This commit is contained in:
committed by
Matthias Mailänder
parent
02d9ba020d
commit
858d782af1
@@ -481,7 +481,7 @@ namespace OpenRA
|
||||
health.InflictDamage(this, attacker, damage, false);
|
||||
}
|
||||
|
||||
public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default(BitSet<DamageType>))
|
||||
public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default)
|
||||
{
|
||||
if (Disposed || health == null)
|
||||
return;
|
||||
|
||||
@@ -155,7 +155,7 @@ namespace OpenRA
|
||||
if (throws)
|
||||
throw new ArgumentException("Collection must not be empty.", nameof(ts));
|
||||
else
|
||||
return default(T);
|
||||
return default;
|
||||
}
|
||||
else
|
||||
return xs.ElementAt(r.Next(xs.Count));
|
||||
@@ -232,7 +232,7 @@ namespace OpenRA
|
||||
if (throws)
|
||||
throw new ArgumentException("Collection must not be empty.", nameof(ts));
|
||||
else
|
||||
return default(T);
|
||||
return default;
|
||||
t = e.Current;
|
||||
u = selector(t);
|
||||
while (e.MoveNext())
|
||||
@@ -525,7 +525,7 @@ namespace OpenRA
|
||||
if (t.IsTraitEnabled())
|
||||
return t;
|
||||
|
||||
return default(T);
|
||||
return default;
|
||||
}
|
||||
|
||||
public static T FirstEnabledTraitOrDefault<T>(this T[] ts)
|
||||
@@ -535,7 +535,7 @@ namespace OpenRA
|
||||
if (t.IsTraitEnabled())
|
||||
return t;
|
||||
|
||||
return default(T);
|
||||
return default;
|
||||
}
|
||||
|
||||
public static LineSplitEnumerator SplitLines(this string str, char separator)
|
||||
@@ -596,7 +596,7 @@ namespace OpenRA
|
||||
|
||||
if (values.Any(x => !names.Contains(x)))
|
||||
{
|
||||
value = default(T);
|
||||
value = default;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ namespace OpenRA
|
||||
}
|
||||
|
||||
innerState = LinkState.Uninitialized;
|
||||
parameters = default(RSAParameters);
|
||||
parameters = default;
|
||||
innerFingerprint = null;
|
||||
innerData = null;
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ namespace OpenRA
|
||||
// so we pre-filter these to avoid returning the wrong result
|
||||
if (GridType == MapGridType.RectangularIsometric && cell.X < cell.Y)
|
||||
{
|
||||
value = default(T);
|
||||
value = default;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ namespace OpenRA
|
||||
return true;
|
||||
}
|
||||
|
||||
value = default(T);
|
||||
value = default;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -327,7 +327,7 @@ namespace OpenRA
|
||||
{
|
||||
var inherited = new Dictionary<string, MiniYamlNode.SourceLocation>
|
||||
{
|
||||
{ kv.Key, default(MiniYamlNode.SourceLocation) }
|
||||
{ kv.Key, default }
|
||||
};
|
||||
|
||||
var children = ResolveInherits(kv.Value, tree, inherited);
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace OpenRA
|
||||
else
|
||||
throw new InvalidOperationException($"Cannot locate type: {className}");
|
||||
|
||||
return default(T);
|
||||
return default;
|
||||
}
|
||||
|
||||
var ctor = ctorCache[type];
|
||||
|
||||
@@ -87,8 +87,8 @@ namespace OpenRA
|
||||
// Each player is identified with a unique bit in the set
|
||||
// Cache masks for the player's index and ally/enemy player indices for performance.
|
||||
public LongBitSet<PlayerBitMask> PlayerMask;
|
||||
public LongBitSet<PlayerBitMask> AlliedPlayersMask = default(LongBitSet<PlayerBitMask>);
|
||||
public LongBitSet<PlayerBitMask> EnemyPlayersMask = default(LongBitSet<PlayerBitMask>);
|
||||
public LongBitSet<PlayerBitMask> AlliedPlayersMask = default;
|
||||
public LongBitSet<PlayerBitMask> EnemyPlayersMask = default;
|
||||
|
||||
public bool UnlockedRenderPlayer
|
||||
{
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace OpenRA.Primitives
|
||||
{
|
||||
var result = Get(typeof(T), false);
|
||||
if (result == null)
|
||||
return default(T);
|
||||
return default;
|
||||
return (T)result;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace OpenRA.Scripting
|
||||
public static bool TryGetClrValue<T>(this LuaValue value, out T clrObject)
|
||||
{
|
||||
var ret = value.TryGetClrValue(typeof(T), out object temp);
|
||||
clrObject = ret ? (T)temp : default(T);
|
||||
clrObject = ret ? (T)temp : default;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace OpenRA
|
||||
if (!fileSystem.Exists(filename))
|
||||
{
|
||||
Log.Write("sound", "LoadSound, file does not exist: {0}", filename);
|
||||
return default(T);
|
||||
return default;
|
||||
}
|
||||
|
||||
using (var stream = fileSystem.Open(filename))
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace OpenRA.Traits
|
||||
public readonly struct Target
|
||||
{
|
||||
public static readonly Target[] None = Array.Empty<Target>();
|
||||
public static readonly Target Invalid = default(Target);
|
||||
public static readonly Target Invalid = default;
|
||||
|
||||
readonly TargetType type;
|
||||
readonly Actor actor;
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace OpenRA.Traits
|
||||
public Damage(int damage)
|
||||
{
|
||||
Value = damage;
|
||||
DamageTypes = default(BitSet<DamageType>);
|
||||
DamageTypes = default;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace OpenRA.Widgets
|
||||
{
|
||||
if (!data.TryGetValue(key, out var s))
|
||||
{
|
||||
result = default(T);
|
||||
result = default;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -340,7 +340,7 @@ namespace OpenRA.Widgets
|
||||
|
||||
void ForceYieldMouseFocus()
|
||||
{
|
||||
if (Ui.MouseFocusWidget == this && !YieldMouseFocus(default(MouseInput)))
|
||||
if (Ui.MouseFocusWidget == this && !YieldMouseFocus(default))
|
||||
Ui.MouseFocusWidget = null;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,8 +50,8 @@ namespace OpenRA
|
||||
public readonly MersenneTwister SharedRandom;
|
||||
public readonly MersenneTwister LocalRandom;
|
||||
public readonly IModelCache ModelCache;
|
||||
public LongBitSet<PlayerBitMask> AllPlayersMask = default(LongBitSet<PlayerBitMask>);
|
||||
public readonly LongBitSet<PlayerBitMask> NoPlayersMask = default(LongBitSet<PlayerBitMask>);
|
||||
public LongBitSet<PlayerBitMask> AllPlayersMask = default;
|
||||
public readonly LongBitSet<PlayerBitMask> NoPlayersMask = default;
|
||||
|
||||
public Player[] Players = Array.Empty<Player>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user