Skip to content

Commit

Permalink
Merge pull request #296 from llealloo/format
Browse files Browse the repository at this point in the history
Format
  • Loading branch information
pema99 committed Feb 11, 2024
2 parents 76925fd + fb10ef6 commit 682b11b
Show file tree
Hide file tree
Showing 21 changed files with 215 additions and 38 deletions.
189 changes: 189 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
# editorconfig.org

# top-most EditorConfig file
root = true

# Default settings:
# A newline ending every file
# Use 4 spaces as indentation
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

# Generated code
[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
generated_code = true

# C# files
[*.cs]
# 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_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion

# avoid this. unless absolutely necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# Types: use keywords instead of BCL types, and permit var only when the type is clear
csharp_style_var_for_built_in_types = false:suggestion
csharp_style_var_when_type_is_apparent = false:none
csharp_style_var_elsewhere = false:suggestion
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const
dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# static fields should have s_ prefix
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.capitalization = camel_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case

# Code style defaults
csharp_using_directive_placement = outside_namespace:suggestion
dotnet_sort_system_directives_first = true
csharp_prefer_braces = true:silent
csharp_preserve_single_line_blocks = true:none
csharp_preserve_single_line_statements = false:none
csharp_prefer_static_local_function = true:suggestion
csharp_prefer_simple_using_statement = false:none
csharp_style_prefer_switch_expression = true:suggestion
dotnet_style_readonly_field = true:suggestion

# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
csharp_prefer_simple_default_expression = true:suggestion

# Expression-bodied members
csharp_style_expression_bodied_methods = true:silent
csharp_style_expression_bodied_constructors = true:silent
csharp_style_expression_bodied_operators = true:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = true:silent

# Pattern matching
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion

# Null checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Other features
csharp_style_prefer_index_operator = false:none
csharp_style_prefer_range_operator = false:none
csharp_style_pattern_local_over_anonymous_function = false:none

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = do_not_ignore
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# License header
file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
indent_brace_style = Allman

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
indent_size = 2

[*.{csproj,vbproj,proj,nativeproj,locproj}]
charset = utf-8

# Xml build files
[*.builds]
indent_size = 2

# Xml files
[*.{xml,stylecop,resx,ruleset}]
indent_size = 2

# Xml config files
[*.{props,targets,config,nuspec}]
indent_size = 2

# YAML config files
[*.{yml,yaml}]
indent_size = 2

# Shell scripts
[*.sh]
end_of_line = lf
[*.{cmd,bat}]
end_of_line = crlf
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ public override void OnPlayerTriggerEnter(VRCPlayerApi player)
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.IO;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Collections.Generic;
using UnityEditor;
using UnityEditor.SceneManagement;
using UnityEditor.Experimental.SceneManagement;
using UnityEditor.SceneManagement;
using UnityEngine;

namespace AudioLink.Editor
Expand Down Expand Up @@ -130,4 +130,4 @@ private static GameObject[] GetGameObjectsInScene(string name, bool includeInact
return objects.Where(t => t.gameObject.name == name).Select(t => t.gameObject).ToArray();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ public static void LinkAll(AudioLink target)
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ public override void OnInspectorGUI()
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ private static void ReplaceInFile(string path)
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using UnityEngine;
using System;
using System;
using UnityEngine;

namespace AudioLink
{
Expand Down Expand Up @@ -409,4 +409,4 @@ public string GetCustomString2()
}
#endregion
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ public enum MediaLoop
Random = 3,
RandomLoop = 4
}
}
}
6 changes: 2 additions & 4 deletions Packages/com.llealloo.audiolink/Runtime/Scripts/AudioLink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ namespace AudioLink
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public partial class AudioLink : UdonSharpBehaviour
#else
using static Shader;

using Unity.Collections;

using UnityEngine.Rendering;
using static Shader;

public partial class AudioLink : MonoBehaviour
#endif
Expand Down Expand Up @@ -569,7 +567,7 @@ public override void OnAsyncGpuReadbackComplete(VRCAsyncGPUReadbackRequest reque
public void OnAsyncGpuReadbackComplete(AsyncGPUReadbackRequest request)
{
if (request.hasError || !request.done) return;

NativeArray<Color> data = request.GetData<Color>();
for (int i = 0; i < data.Length; i++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,4 +369,4 @@ public override void OnPlayerLeft(VRCPlayerApi player)
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ private Color HueShift(Color color, float hueShiftAmount)
return Color.HSVToRGB(h, s, v);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ public void UpdateDataIndex()
_dataIndex = (band * 128) + delay;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ public void UpdateMaterial()
mesh.SetPropertyBlock(block);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ private Color HueShift(Color color, float hueShiftAmount)
return Color.HSVToRGB(h, s, v);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ public void SlideUpdate()
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ public void ToggleUpdate()
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void ForceThemeColorMode()
{
return;
}

themeColorToggle.isOn = false;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#if !UDONSHARP && !COMPILER_UDONSHARP
namespace AudioLink { internal class UdonSyncedAttribute : System.Attribute { } } // stub so we don't have to do the #if UDONSHARP song and dance
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -418,4 +418,4 @@ public override void OnInspectorGUI()
}

}
#endif
#endif
12 changes: 1 addition & 11 deletions format.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
array=(
"./AudioLinkUnityProject/AudioLink.csproj"
"./AudioLinkUnityProject/AudioLink.Editor.csproj"
"./AudioLinkUnityProject/AudioLink.Extras.csproj"
"./AudioLinkUnityProject/AudioLink.Extras.Editor.csproj"
)

for i in ${array[@]}
do
dotnet format $i
done
dotnet format "./AudioLinkUnityProject/AudioLinkUnityProject.sln" --verbosity diag --severity warn

0 comments on commit 682b11b

Please sign in to comment.