Add linting (#251)

.buildkite/premerge.steps.yaml

@@ -7,7 +7,7 @@
 # You may find the example pipeline steps listed here helpful: https://buildkite.com/docs/pipelines/defining-steps#example-pipeline but please
 #  note that the setup is already done, so you should not manually adjust anything through the BuildKite interface.
 #
-common: &common
+windows: &windows
   agents:
     - "capable_of_building=gdk-for-unity"
     - "environment=production"
@@ -66,10 +66,14 @@ macos: &macos
 dag: true
 
 steps:
+  - label: ":debian: ~ lint :lint-roller:"
+    command: bash -c ci/lint.sh
+    <<: *linux
+
   - label: ":windows: ~ test"
     id: "test"
     command: bash -c ci/test.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
 
@@ -89,7 +93,7 @@ steps:
 
   - label: ":windows: ~ build :android:"
     command: bash -c .shared-ci/scripts/build-worker.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
     env:
@@ -112,7 +116,7 @@ steps:
 
   - label: ":windows: ~ build UnityClient mono"
     command: bash -c .shared-ci/scripts/build-worker.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
     env:
@@ -122,7 +126,7 @@ steps:
 
   - label: ":windows: ~ build UnityClient il2cpp"
     command: bash -c .shared-ci/scripts/build-worker.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
     env:
@@ -132,7 +136,7 @@ steps:
 
   - label: ":windows: ~ build UnityGameLogic mono"
     command: bash -c .shared-ci/scripts/build-worker.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
     env:
@@ -142,7 +146,7 @@ steps:
 
   - label: ":windows: ~ build SimulatedPlayerCoordinator mono"
     command: bash -c .shared-ci/scripts/build-worker.sh
-    <<: *common
+    <<: *windows
     artifact_paths:
       - logs/**/*
     env:

.editorconfig

@@ -15,6 +15,37 @@ max_line_length = 120
 [*.cs]
 indent_size = 4
 
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+
+# Space preferences
+csharp_space_after_cast = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+
 [*.json]
 indent_size = 2
 

ci/bootstrap.sh

@@ -21,26 +21,7 @@ cd "$(dirname "$0")/../"
 
 echo "--- Bootstrapping :boot:"
 
-SHARED_CI_DIR="$(pwd)/.shared-ci"
-CLONE_URL="[email protected]:spatialos/gdk-for-unity-shared-ci.git"
-PINNED_SHARED_CI_BRANCH=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 1)
-PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 2)
-
-# Clone the HEAD of the shared CI repo into ".shared-ci"
-
-if [[ -d "${SHARED_CI_DIR}" ]]; then
-    rm -rf "${SHARED_CI_DIR}"
-fi
-
-mkdir "${SHARED_CI_DIR}"
-
-# Workaround for being unable to clone a specific commit with depth of 1.
-pushd "${SHARED_CI_DIR}"
-    git init
-    git remote add origin "${CLONE_URL}"
-    git fetch --depth 20 origin "${PINNED_SHARED_CI_BRANCH}"
-    git checkout "${PINNED_SHARED_CI_VERSION}"
-popd
+./ci/get-shared-ci.sh
 
 # Clone the GDK for Unity repository
 

ci/get-shared-ci.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e -u -o pipefail
+
+if [[ -n "${DEBUG-}" ]]; then
+  set -x
+fi
+
+SHARED_CI_DIR="$(pwd)/.shared-ci"
+CLONE_URL="[email protected]:spatialos/gdk-for-unity-shared-ci.git"
+PINNED_SHARED_CI_BRANCH=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 1)
+PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 2)
+
+if [[ -d "${SHARED_CI_DIR}" ]]; then
+    rm -rf "${SHARED_CI_DIR}"
+fi
+
+mkdir "${SHARED_CI_DIR}"
+
+# Clone the HEAD of the shared CI repo into ".shared-ci"
+# Workaround for being unable to clone a specific commit with depth of 1.
+pushd "${SHARED_CI_DIR}"
+    git init
+    git remote add origin "${CLONE_URL}"
+    git fetch --depth 20 origin "${PINNED_SHARED_CI_BRANCH}"
+    git checkout "${PINNED_SHARED_CI_VERSION}"
+popd

ci/lint.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e -u -o pipefail
+
+if [[ -n "${DEBUG-}" ]]; then
+  set -x
+fi
+
+cd "$(dirname "$0")/.."
+
+./ci/get-shared-ci.sh
+./.shared-ci/scripts/lint.sh ./workers/unity --check

ci/shared-ci.pinned

@@ -1 +1 @@
-master a6c1fcd9562bf40160214acddc7e1a732a66faf4
+master 7980ef5db74d8db47c0f683378a38d64accd2c0a 

workers/unity/Assets/Fps/Scripts/Animation/FpsAnimator.cs

@@ -1,4 +1,4 @@
-using Fps.Movement;
+using Fps.Movement;
 using UnityEngine;
 
 namespace Fps.Animation
@@ -43,7 +43,8 @@ private class AnimationBoolParameter
             public bool LastValue;
         }
 
-        [SerializeField] private AnimationSettings animationSettings = new AnimationSettings
+        [SerializeField]
+        private AnimationSettings animationSettings = new AnimationSettings
         {
             InterpolatePitchDuration = 0.1f,
             InterpolateMovementDuration = 0.1f,

workers/unity/Assets/Fps/Scripts/Animation/ProxyAnimation.cs

@@ -1,4 +1,4 @@
-using Fps.Movement;
+using Fps.Movement;
 using Fps.SchemaExtensions;
 using Improbable.Gdk.Subscriptions;
 using UnityEngine;

workers/unity/Assets/Fps/Scripts/AssemblyInfo.cs

@@ -1,3 +1,3 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Improbable.Fps.Editor")]

workers/unity/Assets/Fps/Scripts/Config/AdvancedEntityPipeline.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Fps.Movement;
 using Fps.SchemaExtensions;

workers/unity/Assets/Fps/Scripts/Config/SettingsPublisher.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace Fps.Config
 {

workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/GunDictionaryPublisher.cs

@@ -1,4 +1,4 @@
-using Fps.Guns;
+using Fps.Guns;
 using UnityEngine;
 
 namespace Fps.Config

workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/ISettingsPublisher.cs

@@ -1,4 +1,4 @@
-namespace Fps.Config
+namespace Fps.Config
 {
     public interface ISettingsPublisher
     {

workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/MapQualitySettingsPublisher.cs

@@ -1,4 +1,4 @@
-using Fps.WorldTiles;
+using Fps.WorldTiles;
 using UnityEngine;
 
 namespace Fps.Config

workers/unity/Assets/Fps/Scripts/Editor/Hud/Mobile/TouchscreenButtonAnimatorInspector.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Fps.UI;
 using UnityEditor;
 using UnityEngine;

workers/unity/Assets/Fps/Scripts/Editor/WorldTiles/MapQualitySettingsInspector.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Fps.WorldTiles;
 using UnityEditor;
 using UnityEngine;

workers/unity/Assets/Fps/Scripts/Editor/WorldTiles/MapTemplateInspector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Fps.WorldTiles;
 using UnityEditor;

workers/unity/Assets/Fps/Scripts/Guns/Behaviours/GunSocket.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Rendering;
 
 namespace Fps.Guns

workers/unity/Assets/Fps/Scripts/Guns/Behaviours/IRecoil.cs

@@ -1,4 +1,4 @@
-namespace Fps.Guns
+namespace Fps.Guns
 {
     public interface IRecoil
     {

workers/unity/Assets/Fps/Scripts/Guns/Behaviours/ShotRenderer.cs

@@ -31,7 +31,8 @@ private struct BulletDetails
         [SerializeField]
         private float fullLengthShotThreshold = 50f;
 
-        [Tooltip("If false, the BarrelLerpThreshold will not be used.")] [SerializeField]
+        [Tooltip("If false, the BarrelLerpThreshold will not be used.")]
+        [SerializeField]
         private bool barrelSnap = true;
 
         private bool muzzleFlashNeedsRefresh;

workers/unity/Assets/Fps/Scripts/Guns/Settings/GunSettings.cs

@@ -18,7 +18,8 @@ public class GunSettings : ScriptableObject
 
         [SerializeField] private bool isAutomatic;
 
-        [Tooltip("In 'Shots per second'. If <= 0, there will be no cooldown between shots.")] [SerializeField]
+        [Tooltip("In 'Shots per second'. If <= 0, there will be no cooldown between shots.")]
+        [SerializeField]
         private float rateOfFire;
 
         [SerializeField] [HideInInspector] private float shotCooldown;
@@ -29,16 +30,20 @@ public class GunSettings : ScriptableObject
         [SerializeField] private float aimFov = 60;
         [SerializeField] private float fovChangeTime = 0.1f;
 
-        [Tooltip("Bullets fired when not aiming will have this spread in meters at 50m range.")] [SerializeField]
+        [Tooltip("Bullets fired when not aiming will have this spread in meters at 50m range.")]
+        [SerializeField]
         private float inaccuracyFromHip;
 
-        [Tooltip("Bullets fired when aiming will have this spread in meters at 50m range.")] [SerializeField]
+        [Tooltip("Bullets fired when aiming will have this spread in meters at 50m range.")]
+        [SerializeField]
         private float inaccuracyWhileAiming;
 
-        [Tooltip("Whilst aiming, override the camera's Pitch Speed with this value.")] [SerializeField]
+        [Tooltip("Whilst aiming, override the camera's Pitch Speed with this value.")]
+        [SerializeField]
         private float aimPitchSpeed = 1;
 
-        [Tooltip("Whilst aiming, override the camera's Yaw Speed with this value.")] [SerializeField]
+        [Tooltip("Whilst aiming, override the camera's Yaw Speed with this value.")]
+        [SerializeField]
         private float aimYawSpeed = 1;
 
 

workers/unity/Assets/Fps/Scripts/Health/Settings/PlayerHealthSettings.cs

@@ -1,4 +1,4 @@
-namespace Fps.Health
+namespace Fps.Health
 {
     public static class PlayerHealthSettings
     {

workers/unity/Assets/Fps/Scripts/HealthPickup/HealthPickupMovement.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Fps.Config;
 using Improbable.Gdk.Subscriptions;
 using UnityEngine;

workers/unity/Assets/Fps/Scripts/Movement/Behaviours/ClientMovementDriver.cs

@@ -18,7 +18,8 @@ public class ClientMovementDriver : GroundCheckingDriver
         [SerializeField] [HideInInspector] private float transformUpdateDelta;
         [SerializeField] [HideInInspector] private float rotationUpdateDelta;
 
-        [SerializeField] private MovementSettings movementSettings = new MovementSettings
+        [SerializeField]
+        private MovementSettings movementSettings = new MovementSettings
         {
             MovementSpeed = new MovementSpeedSettings
             {
@@ -35,7 +36,8 @@ public class ClientMovementDriver : GroundCheckingDriver
             InAirDamping = 1.0f
         };
 
-        [SerializeField] private RotationConstraints rotationConstraints = new RotationConstraints
+        [SerializeField]
+        private RotationConstraints rotationConstraints = new RotationConstraints
         {
             XAxisRotation = true,
             YAxisRotation = true,

workers/unity/Assets/Fps/Scripts/Movement/Behaviours/FpsDriver.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using Fps.Animation;
 using Fps.Guns;
@@ -38,7 +38,8 @@ private struct CameraSettings
         [SerializeField] private Transform pitchTransform;
         [SerializeField] private new Camera camera;
 
-        [SerializeField] private CameraSettings cameraSettings = new CameraSettings
+        [SerializeField]
+        private CameraSettings cameraSettings = new CameraSettings
         {
             PitchSpeed = 1.0f,
             YawSpeed = 1.0f,

workers/unity/Assets/Fps/Scripts/Movement/Behaviours/GroundCheckingDriver.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace Fps.Movement
 {

workers/unity/Assets/Fps/Scripts/Movement/Behaviours/Motor Extensions/MotorSlopeExtension.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace Fps.Movement
 {

workers/unity/Assets/Fps/Scripts/Movement/Behaviours/ProxyMovementDriver.cs

@@ -12,7 +12,8 @@ public class ProxyMovementDriver : GroundCheckingDriver
         [Require] private ClientRotationReader client;
 #pragma warning restore 649
 
-        [SerializeField] private RotationConstraints rotationConstraints = new RotationConstraints
+        [SerializeField]
+        private RotationConstraints rotationConstraints = new RotationConstraints
         {
             XAxisRotation = true,
             YAxisRotation = true,