Skip to content

Commit 781c251

Browse files
0xFA110xFA11
committed
style: enforce more modern language features when available
1 parent 6796eae commit 781c251

37 files changed

+303
-324
lines changed

‎.editorconfig

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,36 @@ trim_trailing_whitespace = true
1212
indent_style = space
1313
indent_size = 4
1414

15-
# formatting rules
15+
# Code style defaults
1616
dotnet_diagnostic.IDE0001.severity = error # Simplify name
1717
dotnet_diagnostic.IDE0002.severity = error # Simplify member access
1818
dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary import
1919
dotnet_diagnostic.IDE0063.severity = error # Use simple 'using' statement
20+
csharp_style_var_when_type_is_apparent = true:error
21+
dotnet_style_require_accessibility_modifiers = always:error
22+
csharp_prefer_braces = true:error
23+
24+
# Sort using directives with System.* appearing first
2025
dotnet_sort_system_directives_first = true:error
2126
dotnet_separate_import_directive_groups = false:error
2227
csharp_using_directive_placement = outside_namespace:error
28+
29+
# Avoid "this." if not necessary
2330
dotnet_style_qualification_for_field = false:error
2431
dotnet_style_qualification_for_property = false:error
2532
dotnet_style_qualification_for_method = false:error
2633
dotnet_style_qualification_for_event = false:error
34+
35+
# Use language keywords instead of framework type names for type references
2736
dotnet_style_predefined_type_for_locals_parameters_members = true:error
2837
dotnet_style_predefined_type_for_member_access = true:error
29-
dotnet_style_require_accessibility_modifiers = always:error
30-
csharp_style_var_when_type_is_apparent = true:error
31-
csharp_prefer_braces = true:error
38+
39+
# Enforce more modern language features when available
40+
dotnet_style_object_initializer = true:error
41+
dotnet_style_collection_initializer = true:error
42+
dotnet_style_coalesce_expression = true:error
43+
dotnet_style_null_propagation = true:error
44+
dotnet_style_explicit_tuple_names = true:error
3245

3346
# naming rules
3447
# namespace Unity.Netcode { ... }

‎com.unity.netcode.gameobjects/Components/NetworkAnimator.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,10 @@ private void Awake()
570570

571571
// We initialize the m_AnimationMessage for all instances in the event that
572572
// ownership or authority changes during runtime.
573-
m_AnimationMessage = new AnimationMessage();
574-
m_AnimationMessage.AnimationStates = new List<AnimationState>();
573+
m_AnimationMessage = new AnimationMessage
574+
{
575+
AnimationStates = new List<AnimationState>()
576+
};
575577

576578
// Store off our current layer weights and create our animation
577579
// state entries per layer.
@@ -653,9 +655,13 @@ public override void OnNetworkSpawn()
653655
if (IsServer)
654656
{
655657
m_ClientSendList = new List<ulong>(128);
656-
m_ClientRpcParams = new ClientRpcParams();
657-
m_ClientRpcParams.Send = new ClientRpcSendParams();
658-
m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
658+
m_ClientRpcParams = new ClientRpcParams
659+
{
660+
Send = new ClientRpcSendParams
661+
{
662+
TargetClientIds = m_ClientSendList
663+
}
664+
};
659665
}
660666

661667
// Create a handler for state changes
@@ -698,10 +704,7 @@ private void WriteSynchronizationData<T>(ref BufferSerializer<T> serializer) whe
698704
for (int layer = 0; layer < m_Animator.layerCount; layer++)
699705
{
700706
var synchronizationStateInfo = m_Animator.GetCurrentAnimatorStateInfo(layer);
701-
if (SynchronizationStateInfo != null)
702-
{
703-
SynchronizationStateInfo.Add(synchronizationStateInfo);
704-
}
707+
SynchronizationStateInfo?.Add(synchronizationStateInfo);
705708
var stateHash = synchronizationStateInfo.fullPathHash;
706709
var normalizedTime = synchronizationStateInfo.normalizedTime;
707710
var isInTransition = m_Animator.IsInTransition(layer);

‎com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,19 @@ private static void DrawInstallMultiplayerToolsTip()
355355

356356
if (s_CenteredWordWrappedLabelStyle == null)
357357
{
358-
s_CenteredWordWrappedLabelStyle = new GUIStyle(GUI.skin.label);
359-
s_CenteredWordWrappedLabelStyle.wordWrap = true;
360-
s_CenteredWordWrappedLabelStyle.alignment = TextAnchor.MiddleLeft;
358+
s_CenteredWordWrappedLabelStyle = new GUIStyle(GUI.skin.label)
359+
{
360+
wordWrap = true,
361+
alignment = TextAnchor.MiddleLeft
362+
};
361363
}
362364

363365
if (s_HelpBoxStyle == null)
364366
{
365-
s_HelpBoxStyle = new GUIStyle(EditorStyles.helpBox);
366-
s_HelpBoxStyle.padding = new RectOffset(10, 10, 10, 10);
367+
s_HelpBoxStyle = new GUIStyle(EditorStyles.helpBox)
368+
{
369+
padding = new RectOffset(10, 10, 10, 10)
370+
};
367371
}
368372

369373
var openDocsButtonStyle = GUI.skin.button;

‎com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,10 +1220,7 @@ internal void ShutdownInternal()
12201220
if (wasServer)
12211221
{
12221222
// make sure all messages are flushed before transport disconnect clients
1223-
if (MessagingSystem != null)
1224-
{
1225-
MessagingSystem.ProcessSendQueues();
1226-
}
1223+
MessagingSystem?.ProcessSendQueues();
12271224

12281225
var disconnectedIds = new HashSet<ulong>();
12291226

@@ -1312,10 +1309,7 @@ internal void ShutdownInternal()
13121309
NetworkConfig.NetworkTransport.OnTransportEvent -= HandleRawTransportPoll;
13131310
}
13141311

1315-
if (DeferredMessageManager != null)
1316-
{
1317-
DeferredMessageManager.CleanupAllTriggers();
1318-
}
1312+
DeferredMessageManager?.CleanupAllTriggers();
13191313

13201314
if (SceneManager != null)
13211315
{
@@ -1538,10 +1532,9 @@ private void SendConnectionRequest()
15381532
// we should always force the rebuilding of the NetworkConfig hash value
15391533
ConfigHash = NetworkConfig.GetConfig(false),
15401534
ShouldSendConnectionData = NetworkConfig.ConnectionApproval,
1541-
ConnectionData = NetworkConfig.ConnectionData
1535+
ConnectionData = NetworkConfig.ConnectionData,
1536+
MessageVersions = new NativeArray<MessageVersionData>(MessagingSystem.MessageHandlers.Length, Allocator.Temp)
15421537
};
1543-
1544-
message.MessageVersions = new NativeArray<MessageVersionData>(MessagingSystem.MessageHandlers.Length, Allocator.Temp);
15451538
for (int index = 0; index < MessagingSystem.MessageHandlers.Length; index++)
15461539
{
15471540
if (MessagingSystem.MessageTypes[index] != null)
@@ -1913,8 +1906,10 @@ public void DisconnectClient(ulong clientId, string reason)
19131906

19141907
if (!string.IsNullOrEmpty(reason))
19151908
{
1916-
var disconnectReason = new DisconnectReasonMessage();
1917-
disconnectReason.Reason = reason;
1909+
var disconnectReason = new DisconnectReasonMessage
1910+
{
1911+
Reason = reason
1912+
};
19181913
SendMessage(ref disconnectReason, NetworkDelivery.Reliable, clientId);
19191914
}
19201915
MessagingSystem.ProcessSendQueues();
@@ -2161,8 +2156,10 @@ internal void HandleConnectionApproval(ulong ownerClientId, ConnectionApprovalRe
21612156
{
21622157
if (!string.IsNullOrEmpty(response.Reason))
21632158
{
2164-
var disconnectReason = new DisconnectReasonMessage();
2165-
disconnectReason.Reason = response.Reason;
2159+
var disconnectReason = new DisconnectReasonMessage
2160+
{
2161+
Reason = response.Reason
2162+
};
21662163
SendMessage(ref disconnectReason, NetworkDelivery.Reliable, ownerClientId);
21672164

21682165
MessagingSystem.ProcessSendQueues();

‎com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,9 +1183,11 @@ private void OnClientUnloadScene(uint sceneEventId)
11831183
SceneManagerHandler.MoveObjectsFromSceneToDontDestroyOnLoad(ref networkManager, scene);
11841184

11851185
m_IsSceneEventActive = true;
1186-
var sceneEventProgress = new SceneEventProgress(m_NetworkManager);
1187-
sceneEventProgress.SceneEventId = sceneEventData.SceneEventId;
1188-
sceneEventProgress.OnSceneEventCompleted = OnSceneUnloaded;
1186+
var sceneEventProgress = new SceneEventProgress(m_NetworkManager)
1187+
{
1188+
SceneEventId = sceneEventData.SceneEventId,
1189+
OnSceneEventCompleted = OnSceneUnloaded
1190+
};
11891191
var sceneUnload = SceneManagerHandler.UnloadSceneAsync(scene, sceneEventProgress);
11901192

11911193
SceneManagerHandler.StopTrackingScene(sceneHandle, sceneName, m_NetworkManager);
@@ -1286,9 +1288,11 @@ internal void UnloadAdditivelyLoadedScenes(uint sceneEventId)
12861288
// Validate the scene as well as ignore the DDOL (which will have a negative buildIndex)
12871289
if (currentActiveScene.name != keyHandleEntry.Value.name && keyHandleEntry.Value.buildIndex >= 0)
12881290
{
1289-
var sceneEventProgress = new SceneEventProgress(m_NetworkManager);
1290-
sceneEventProgress.SceneEventId = sceneEventId;
1291-
sceneEventProgress.OnSceneEventCompleted = EmptySceneUnloadedOperation;
1291+
var sceneEventProgress = new SceneEventProgress(m_NetworkManager)
1292+
{
1293+
SceneEventId = sceneEventId,
1294+
OnSceneEventCompleted = EmptySceneUnloadedOperation
1295+
};
12921296
var sceneUnload = SceneManagerHandler.UnloadSceneAsync(keyHandleEntry.Value, sceneEventProgress);
12931297
SceneUnloadEventHandler.RegisterScene(this, keyHandleEntry.Value, LoadSceneMode.Additive, sceneUnload);
12941298
}
@@ -1523,9 +1527,11 @@ private void OnClientSceneLoadingEvent(uint sceneEventId)
15231527
SceneUnloadEventHandler.RegisterScene(this, SceneManager.GetActiveScene(), LoadSceneMode.Single);
15241528

15251529
}
1526-
var sceneEventProgress = new SceneEventProgress(m_NetworkManager);
1527-
sceneEventProgress.SceneEventId = sceneEventId;
1528-
sceneEventProgress.OnSceneEventCompleted = OnSceneLoaded;
1530+
var sceneEventProgress = new SceneEventProgress(m_NetworkManager)
1531+
{
1532+
SceneEventId = sceneEventId,
1533+
OnSceneEventCompleted = OnSceneLoaded
1534+
};
15291535
var sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, sceneEventData.LoadSceneMode, sceneEventProgress);
15301536

15311537
OnSceneEvent?.Invoke(new SceneEvent()
@@ -1834,9 +1840,11 @@ private void OnClientBeginSync(uint sceneEventId)
18341840
if (!shouldPassThrough)
18351841
{
18361842
// If not, then load the scene
1837-
var sceneEventProgress = new SceneEventProgress(m_NetworkManager);
1838-
sceneEventProgress.SceneEventId = sceneEventId;
1839-
sceneEventProgress.OnSceneEventCompleted = ClientLoadedSynchronization;
1843+
var sceneEventProgress = new SceneEventProgress(m_NetworkManager)
1844+
{
1845+
SceneEventId = sceneEventId,
1846+
OnSceneEventCompleted = ClientLoadedSynchronization
1847+
};
18401848
sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, loadSceneMode, sceneEventProgress);
18411849

18421850
// Notify local client that a scene load has begun

‎com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,8 +1299,10 @@ public unsafe void ReadValue<T>(out T value, FastBufferWriter.ForFixedStrings un
12991299
where T : unmanaged, INativeList<byte>, IUTF8Bytes
13001300
{
13011301
ReadUnmanaged(out int length);
1302-
value = new T();
1303-
value.Length = length;
1302+
value = new T
1303+
{
1304+
Length = length
1305+
};
13041306
ReadBytes(value.GetUnsafePtr(), length);
13051307
}
13061308

@@ -1319,8 +1321,10 @@ public unsafe void ReadValueSafe<T>(out T value, FastBufferWriter.ForFixedString
13191321
where T : unmanaged, INativeList<byte>, IUTF8Bytes
13201322
{
13211323
ReadUnmanagedSafe(out int length);
1322-
value = new T();
1323-
value.Length = length;
1324+
value = new T
1325+
{
1326+
Length = length
1327+
};
13241328
ReadBytesSafe(value.GetUnsafePtr(), length);
13251329
}
13261330

‎com.unity.netcode.gameobjects/Runtime/Serialization/NetworkObjectReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public bool TryGet(out NetworkObject networkObject, NetworkManager networkManage
9090
[MethodImpl(MethodImplOptions.AggressiveInlining)]
9191
private static NetworkObject Resolve(NetworkObjectReference networkObjectRef, NetworkManager networkManager = null)
9292
{
93-
networkManager = networkManager != null ? networkManager : NetworkManager.Singleton;
93+
networkManager = networkManager ?? NetworkManager.Singleton;
9494
networkManager.SpawnManager.SpawnedObjects.TryGetValue(networkObjectRef.m_NetworkObjectId, out NetworkObject networkObject);
9595

9696
return networkObject;

‎com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ public NetcodeIntegrationTest(HostOrServer hostOrServer)
10391039
/// </summary>
10401040
protected void AssertOnTimeout(string timeOutErrorMessage, TimeoutHelper assignedTimeoutHelper = null)
10411041
{
1042-
var timeoutHelper = assignedTimeoutHelper != null ? assignedTimeoutHelper : s_GlobalTimeoutHelper;
1042+
var timeoutHelper = assignedTimeoutHelper ?? s_GlobalTimeoutHelper;
10431043
Assert.False(timeoutHelper.TimedOut, timeOutErrorMessage);
10441044
}
10451045

‎com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,10 @@ void AddNetworkPrefab(NetworkConfig config, NetworkPrefab prefab)
511511
Assert.IsNotNull(server, prefabCreateAssertError);
512512
Assert.IsFalse(server.IsListening, prefabCreateAssertError);
513513

514-
var gameObject = new GameObject();
515-
gameObject.name = baseName;
514+
var gameObject = new GameObject
515+
{
516+
name = baseName
517+
};
516518
var networkObject = gameObject.AddComponent<NetworkObject>();
517519
networkObject.NetworkManagerOwner = server;
518520
MakeNetworkObjectTestPrefab(networkObject);

‎com.unity.netcode.gameobjects/Tests/Editor/DisconnectMessageTests.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ public void EmptyDisconnectReason()
1010
{
1111
var networkContext = new NetworkContext();
1212
var writer = new FastBufferWriter(20, Allocator.Temp, 20);
13-
var msg = new DisconnectReasonMessage();
14-
msg.Reason = string.Empty;
13+
var msg = new DisconnectReasonMessage
14+
{
15+
Reason = string.Empty
16+
};
1517
msg.Serialize(writer, msg.Version);
1618

1719
var fbr = new FastBufferReader(writer, Allocator.Temp);
@@ -26,8 +28,10 @@ public void DisconnectReason()
2628
{
2729
var networkContext = new NetworkContext();
2830
var writer = new FastBufferWriter(20, Allocator.Temp, 20);
29-
var msg = new DisconnectReasonMessage();
30-
msg.Reason = "Foo";
31+
var msg = new DisconnectReasonMessage
32+
{
33+
Reason = "Foo"
34+
};
3135
msg.Serialize(writer, msg.Version);
3236

3337
var fbr = new FastBufferReader(writer, Allocator.Temp);
@@ -42,8 +46,10 @@ public void DisconnectReasonTooLong()
4246
{
4347
var networkContext = new NetworkContext();
4448
var writer = new FastBufferWriter(20, Allocator.Temp, 20);
45-
var msg = new DisconnectReasonMessage();
46-
msg.Reason = "ThisStringIsWayLongerThanTwentyBytes";
49+
var msg = new DisconnectReasonMessage
50+
{
51+
Reason = "ThisStringIsWayLongerThanTwentyBytes"
52+
};
4753
msg.Serialize(writer, msg.Version);
4854

4955
var fbr = new FastBufferReader(writer, Allocator.Temp);

0 commit comments

Comments
 (0)