Skip to content

Commit 69b06c2

Browse files
committed
style: order modifiers
1 parent 99013c2 commit 69b06c2

File tree

17 files changed

+27
-23
lines changed

17 files changed

+27
-23
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ dotnet_sort_system_directives_first = true:error
2828
dotnet_separate_import_directive_groups = false:error
2929
csharp_using_directive_placement = outside_namespace:error
3030

31+
# Order modifiers
32+
dotnet_diagnostic.IDE0036.severity = error
33+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:error
34+
3135
# Avoid "this." if not necessary
3236
dotnet_style_qualification_for_field = false:error
3337
dotnet_style_qualification_for_property = false:error

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ private void SendParametersUpdate(ClientRpcParams clientRpcParams = default, boo
895895
/// <summary>
896896
/// Helper function to get the cached value
897897
/// </summary>
898-
unsafe private T GetValue<T>(ref AnimatorParamCache animatorParamCache)
898+
private unsafe T GetValue<T>(ref AnimatorParamCache animatorParamCache)
899899
{
900900
T currentValue;
901901
fixed (void* value = animatorParamCache.Value)
@@ -910,7 +910,7 @@ unsafe private T GetValue<T>(ref AnimatorParamCache animatorParamCache)
910910
/// If so, it fills out m_ParametersToUpdate with the indices of the parameters
911911
/// that have changed. Returns true if any parameters changed.
912912
/// </summary>
913-
unsafe private bool CheckParametersChanged()
913+
private unsafe bool CheckParametersChanged()
914914
{
915915
m_ParametersToUpdate.Clear();
916916
for (int i = 0; i < m_CachedAnimatorParameters.Length; i++)

com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static class QuaternionCompressor
5151
/// <param name="quaternion">the <see cref="Quaternion"/> to be compressed</param>
5252
/// <returns>the <see cref="Quaternion"/> compressed as an unsigned integer</returns>
5353
[MethodImpl(MethodImplOptions.AggressiveInlining)]
54-
static public uint CompressQuaternion(ref Quaternion quaternion)
54+
public static uint CompressQuaternion(ref Quaternion quaternion)
5555
{
5656
// Store off the absolute value for each Quaternion element
5757
s_QuatAbsValues[0] = Mathf.Abs(quaternion[0]);
@@ -97,7 +97,7 @@ static public uint CompressQuaternion(ref Quaternion quaternion)
9797
/// <param name="quaternion">quaternion to store the decompressed values within</param>
9898
/// <param name="compressed">the compressed quaternion</param>
9999
[MethodImpl(MethodImplOptions.AggressiveInlining)]
100-
static public void DecompressQuaternion(ref Quaternion quaternion, uint compressed)
100+
public static void DecompressQuaternion(ref Quaternion quaternion, uint compressed)
101101
{
102102
// Get the last two bits for the index to skip (0-3)
103103
var indexToSkip = (int)(compressed >> 30);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,13 +1128,13 @@ internal bool NetworkManagerCheckForParent(bool ignoreNetworkManagerCache = fals
11281128
return isParented;
11291129
}
11301130

1131-
static internal string GenerateNestedNetworkManagerMessage(Transform transform)
1131+
internal static string GenerateNestedNetworkManagerMessage(Transform transform)
11321132
{
11331133
return $"{transform.name} is nested under {transform.root.name}. NetworkManager cannot be nested.\n";
11341134
}
11351135

11361136
#if UNITY_EDITOR
1137-
static internal INetworkManagerHelper NetworkManagerHelper;
1137+
internal static INetworkManagerHelper NetworkManagerHelper;
11381138
/// <summary>
11391139
/// Interface for NetworkManagerHelper
11401140
/// </summary>

com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ internal static void VerboseDebug(string message)
106106
/// Processes scene loading jobs
107107
/// </summary>
108108
/// <param name="queuedSceneJob">job to process</param>
109-
static internal IEnumerator ProcessLoadingSceneJob(QueuedSceneJob queuedSceneJob)
109+
internal static IEnumerator ProcessLoadingSceneJob(QueuedSceneJob queuedSceneJob)
110110
{
111111
var itegrationTestSceneHandler = queuedSceneJob.IntegrationTestSceneHandler;
112112
while (!itegrationTestSceneHandler.OnCanClientsLoad())
@@ -180,7 +180,7 @@ private static void ProcessInSceneObjects(Scene scene, NetworkManager networkMan
180180
/// Processes scene unloading jobs
181181
/// </summary>
182182
/// <param name="queuedSceneJob">job to process</param>
183-
static internal IEnumerator ProcessUnloadingSceneJob(QueuedSceneJob queuedSceneJob)
183+
internal static IEnumerator ProcessUnloadingSceneJob(QueuedSceneJob queuedSceneJob)
184184
{
185185
var itegrationTestSceneHandler = queuedSceneJob.IntegrationTestSceneHandler;
186186
while (!itegrationTestSceneHandler.OnCanClientsUnload())
@@ -223,7 +223,7 @@ private static void SceneManager_sceneUnloaded(Scene scene)
223223
/// Processes all jobs within the queue.
224224
/// When all jobs are finished, the coroutine stops.
225225
/// </summary>
226-
static internal IEnumerator JobQueueProcessor()
226+
internal static IEnumerator JobQueueProcessor()
227227
{
228228
while (QueuedSceneJobs.Count != 0)
229229
{

com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public override void OnNetworkDespawn()
7171
public NetworkList<int> MyListSetOnSpawn;
7272
public NetworkVariable<int> MyOwnerReadNetworkVariable;
7373
public NetworkList<int> MyList;
74-
static public NetworkManager NetworkManagerOfInterest;
74+
public static NetworkManager NetworkManagerOfInterest;
7575

7676
internal static int GainOwnershipCount = 0;
7777

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public void CommitToTransform()
6363
/// </summary>
6464
public class ChildObjectComponent : NetworkBehaviour
6565
{
66-
public readonly static List<ChildObjectComponent> Instances = new List<ChildObjectComponent>();
66+
public static readonly List<ChildObjectComponent> Instances = new List<ChildObjectComponent>();
6767
public static ChildObjectComponent ServerInstance { get; internal set; }
68-
public readonly static Dictionary<ulong, NetworkObject> ClientInstances = new Dictionary<ulong, NetworkObject>();
68+
public static readonly Dictionary<ulong, NetworkObject> ClientInstances = new Dictionary<ulong, NetworkObject>();
6969

7070
public static void Reset()
7171
{

com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class OwnerModifiedObject : NetworkBehaviour, INetworkUpdateSystem
1616
{
1717
public NetworkList<int> MyNetworkList;
1818

19-
static internal int Updates = 0;
19+
internal static int Updates = 0;
2020

2121
private void Awake()
2222
{

testproject/Assets/Scripts/AddressablesBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public class AddressablesBuilder
88
{
9-
static public void PreExport()
9+
public static void PreExport()
1010
{
1111
if (AddressableAssetSettingsDefaultObject.Settings != null)
1212
{

testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentedUnderGameObjectHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace TestProject.ManualTests
55
{
66
public class InSceneParentedUnderGameObjectHandler : NetworkBehaviour
77
{
8-
static public List<InSceneParentedUnderGameObjectHandler> Instances = new List<InSceneParentedUnderGameObjectHandler>();
8+
public static List<InSceneParentedUnderGameObjectHandler> Instances = new List<InSceneParentedUnderGameObjectHandler>();
99

1010
public override void OnNetworkSpawn()
1111
{

0 commit comments

Comments
 (0)