Skip to content

Commit

Permalink
Merge pull request #142 from goatcorp/editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
Blooym authored Mar 26, 2024
2 parents 19c4bd1 + 595f31d commit 5357a3b
Show file tree
Hide file tree
Showing 61 changed files with 490 additions and 276 deletions.
158 changes: 158 additions & 0 deletions src/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
root = true
# top-most EditorConfig file

[*]
charset = utf-8

end_of_line = lf
insert_final_newline = true

# 4 space indentation
indent_style = space
indent_size = 4

# disable redundant style warnings

# Microsoft .NET properties
csharp_indent_braces = false
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = false
csharp_new_line_before_open_brace = all
csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
csharp_style_var_elsewhere = true:suggestion
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
dotnet_code_quality_unused_parameters = non_public
dotnet_naming_rule.event_rule.severity = warning
dotnet_naming_rule.event_rule.style = upper_camel_case_style
dotnet_naming_rule.event_rule.symbols = event_symbols
dotnet_naming_rule.private_constants_rule.severity = warning
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
dotnet_naming_rule.private_instance_fields_rule.severity = warning
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
dotnet_naming_rule.private_static_fields_rule.severity = warning
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
dotnet_naming_rule.private_static_readonly_rule.severity = warning
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
dotnet_naming_style.on_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.on_upper_camel_case_style.required_prefix = On
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.event_symbols.applicable_accessibilities = *
dotnet_naming_symbols.event_symbols.applicable_kinds = event
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
dotnet_separate_import_directive_groups = true
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
dotnet_style_object_initializer = false
dotnet_style_qualification_for_event = true:suggestion
dotnet_style_qualification_for_field = true:suggestion
dotnet_style_qualification_for_method = true:suggestion
dotnet_style_qualification_for_property = true:suggestion
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_empty_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_before_open_square_brackets = false
csharp_space_before_comma = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_comma = true
csharp_space_after_cast = false
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = none
csharp_space_between_square_brackets = false

# ReSharper properties
resharper_align_linq_query = true
resharper_align_multiline_argument = true
resharper_align_multiline_calls_chain = true
resharper_align_multiline_expression = true
resharper_align_multiline_extends_list = true
resharper_align_multiline_for_stmt = true
resharper_align_multline_type_parameter_constrains = true
resharper_align_multline_type_parameter_list = true
resharper_apply_on_completion = true
resharper_auto_property_can_be_made_get_only_global_highlighting = none
resharper_auto_property_can_be_made_get_only_local_highlighting = none
resharper_autodetect_indent_settings = true
resharper_blank_lines_around_single_line_auto_property = 1
resharper_braces_for_ifelse = required_for_multiline
resharper_can_use_global_alias = false
resharper_csharp_align_multiline_parameter = true
resharper_csharp_align_multiple_declaration = true
resharper_csharp_empty_block_style = multiline
resharper_csharp_int_align_comments = false
resharper_csharp_new_line_before_while = true
resharper_csharp_wrap_after_declaration_lpar = true
resharper_csharp_wrap_after_invocation_lpar = true
resharper_csharp_wrap_arguments_style = chop_if_long
resharper_enforce_line_ending_style = true
resharper_instance_members_qualify_declared_in = this_class, base_class
resharper_int_align = false
resharper_member_can_be_private_global_highlighting = none
resharper_member_can_be_private_local_highlighting = none
resharper_new_line_before_finally = true
resharper_parentheses_non_obvious_operations = none, multiplicative, additive, arithmetic, shift, bitwise_and, bitwise_exclusive_or, bitwise_inclusive_or, bitwise
resharper_parentheses_redundancy_style = remove_if_not_clarifies_precedence
resharper_place_accessorholder_attribute_on_same_line = false
resharper_place_field_attribute_on_same_line = false
resharper_place_simple_initializer_on_single_line = true
resharper_show_autodetect_configure_formatting_tip = false
resharper_space_within_single_line_array_initializer_braces = true
resharper_use_indent_from_vs = false
resharper_wrap_array_initializer_style = chop_if_long

# ReSharper inspection severities
resharper_arrange_missing_parentheses_highlighting = hint
resharper_arrange_redundant_parentheses_highlighting = hint
resharper_arrange_this_qualifier_highlighting = none
resharper_arrange_type_member_modifiers_highlighting = hint
resharper_arrange_type_modifiers_highlighting = hint
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
resharper_built_in_type_reference_style_highlighting = none
resharper_foreach_can_be_converted_to_query_using_another_get_enumerator_highlighting = none
resharper_foreach_can_be_partly_converted_to_query_using_another_get_enumerator_highlighting = none
resharper_invert_if_highlighting = none
resharper_loop_can_be_converted_to_query_highlighting = none
resharper_method_has_async_overload_highlighting = none
resharper_private_field_can_be_converted_to_local_variable_highlighting = none
resharper_redundant_base_qualifier_highlighting = none
resharper_suggest_var_or_type_built_in_types_highlighting = hint
resharper_suggest_var_or_type_elsewhere_highlighting = hint
resharper_suggest_var_or_type_simple_types_highlighting = hint
resharper_unused_auto_property_accessor_global_highlighting = none
csharp_style_deconstructed_variable_declaration = true:silent

[*.{appxmanifest,asax,ascx,aspx,axaml,axml,build,c,c++,cc,cginc,compute,config,cp,cpp,cs,cshtml,csproj,css,cu,cuh,cxx,dbml,discomap,dtd,h,hh,hlsl,hlsli,hlslinc,hpp,htm,html,hxx,inc,inl,ino,ipp,js,json,jsproj,jsx,lsproj,master,mpp,mq4,mq5,mqh,njsproj,nuspec,paml,proj,props,proto,razor,resjson,resw,resx,skin,StyleCop,targets,tasks,tpp,ts,tsx,usf,ush,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
indent_style = space
indent_size = 4
tab_width = 4
dotnet_style_parentheses_in_other_operators = always_for_clarity:silent

[*.{yaml,yml}]
indent_style = space
indent_size = 2
tab_width = 2
4 changes: 3 additions & 1 deletion src/XIVLauncher.Core/Accounts/AccountManager.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;

using Newtonsoft.Json;

using Serilog;

namespace XIVLauncher.Core.Accounts;
Expand Down
2 changes: 0 additions & 2 deletions src/XIVLauncher.Core/Accounts/AccountSwitcherEntry.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using System.Net;

namespace XIVLauncher.Core.Accounts;

class AccountSwitcherEntry
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using KeySharp;

using Serilog;

namespace XIVLauncher.Core.Accounts.Secrets.Providers;
Expand Down
10 changes: 5 additions & 5 deletions src/XIVLauncher.Core/Accounts/XivAccount.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Newtonsoft.Json;
using Serilog;
using System.Net;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SharpGen.Runtime;

using Serilog;

namespace XIVLauncher.Core.Accounts;

Expand Down Expand Up @@ -91,7 +90,8 @@ public static async Task<JObject> GetCharacterSearch(string name, string world)

public static async Task<dynamic> Get(string endpoint)
{
using (var client = new HttpClient()) {
using (var client = new HttpClient())
{
var result = await client.GetStringAsync(URL + endpoint).ConfigureAwait(false);
var parsedObject = JObject.Parse(result);
return parsedObject;
Expand Down
2 changes: 1 addition & 1 deletion src/XIVLauncher.Core/AppUtil.VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ public static VersionInfo Instance()
return version;
}
}
}
}
3 changes: 2 additions & 1 deletion src/XIVLauncher.Core/AppUtil.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Reflection;

using XIVLauncher.Common.Util;

namespace XIVLauncher.Core;
Expand Down Expand Up @@ -61,4 +62,4 @@ public static void OpenBrowser(string url)
PlatformHelpers.OpenBrowser(url);
}
}
}
}
3 changes: 2 additions & 1 deletion src/XIVLauncher.Core/Components/Background.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components;
Expand Down Expand Up @@ -42,4 +43,4 @@ public override void Draw()

base.Draw();
}
}
}
5 changes: 3 additions & 2 deletions src/XIVLauncher.Core/Components/Common/Button.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using ImGuiNET;
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components.Common;

public class Button : Component
Expand Down Expand Up @@ -41,4 +42,4 @@ public override void Draw()
ImGui.PopStyleVar(2);
ImGui.PopStyleColor(3);
}
}
}
3 changes: 2 additions & 1 deletion src/XIVLauncher.Core/Components/Common/Checkbox.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using ImGuiNET;
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components.Common;

public class Checkbox : Component
Expand Down
6 changes: 4 additions & 2 deletions src/XIVLauncher.Core/Components/Common/Input.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using ImGuiNET;
using System.Numerics;

using ImGuiNET;

using Serilog;

namespace XIVLauncher.Core.Components.Common;
Expand Down Expand Up @@ -112,4 +114,4 @@ public override void Draw()
ImGui.PopStyleVar(2);
ImGui.PopStyleColor(4);
}
}
}
2 changes: 1 addition & 1 deletion src/XIVLauncher.Core/Components/Component.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public virtual void Draw()
child.Draw();
}
}
}
}
5 changes: 3 additions & 2 deletions src/XIVLauncher.Core/Components/FtsPage.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components;
Expand Down Expand Up @@ -29,7 +30,7 @@ public void OpenFtsIfNeeded()
else
return;
}

if (!(App.Settings.CompletedFts ?? false) && Program.IsSteamDeckHardware)
{
App.State = LauncherApp.LauncherState.Fts;
Expand Down Expand Up @@ -88,4 +89,4 @@ public override void Draw()

base.Draw();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ public void ReportProgress(long? size, long downloaded, double? progress)
{
// TODO
}
}
}
6 changes: 4 additions & 2 deletions src/XIVLauncher.Core/Components/LoadingPage/LoadingPage.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Numerics;

using ImGuiNET;

using XIVLauncher.Core.Components.Common;

namespace XIVLauncher.Core.Components.LoadingPage;
Expand All @@ -10,7 +12,7 @@ public class LoadingPage : Page

public bool IsIndeterminate { get; set; }
public bool CanCancel { get; set; } = true;
public bool CanDisableAutoLogin { get; set; }= false;
public bool CanDisableAutoLogin { get; set; } = false;
public float Progress { get; set; }

public string Line1 { get; set; } = "Loading text line 1";
Expand Down Expand Up @@ -109,4 +111,4 @@ public override void Draw()

base.Draw();
}
}
}
3 changes: 2 additions & 1 deletion src/XIVLauncher.Core/Components/LoadingPage/Spinner.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components.LoadingPage;
Expand Down Expand Up @@ -45,4 +46,4 @@ public override void Draw()

base.Draw();
}
}
}
4 changes: 3 additions & 1 deletion src/XIVLauncher.Core/Components/MainPage/AccountSwitcher.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Numerics;

using ImGuiNET;

using XIVLauncher.Core.Accounts;

namespace XIVLauncher.Core.Components.MainPage;
Expand Down Expand Up @@ -66,4 +68,4 @@ public override void Draw()

base.Draw();
}
}
}
7 changes: 4 additions & 3 deletions src/XIVLauncher.Core/Components/MainPage/ActionButtons.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Numerics;

using ImGuiNET;

namespace XIVLauncher.Core.Components.MainPage;
Expand All @@ -14,7 +15,7 @@ public override void Draw()
var btnSize = new Vector2(80) * ImGuiHelpers.GlobalScale;

ImGui.PushFont(FontManager.IconFont);

ImGui.BeginDisabled(this.OnQueueButtonClicked == null);
if (ImGui.Button(FontAwesomeIcon.Clock.ToIconString(), btnSize))
{
Expand All @@ -26,7 +27,7 @@ public override void Draw()
ImGui.EndDisabled();

ImGui.SameLine();

ImGui.BeginDisabled(this.OnStatusButtonClicked == null);
if (ImGui.Button(FontAwesomeIcon.Globe.ToIconString(), btnSize))
{
Expand All @@ -53,4 +54,4 @@ public override void Draw()

base.Draw();
}
}
}
Loading

0 comments on commit 5357a3b

Please sign in to comment.