Skip to content

Commit

Permalink
Treewide: Adopt .editorconfig for .NET projects & format
Browse files Browse the repository at this point in the history
  • Loading branch information
pongo1231 committed Feb 12, 2024
1 parent d52893b commit f24ce91
Show file tree
Hide file tree
Showing 16 changed files with 250 additions and 152 deletions.
101 changes: 101 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/.editorconfig

root = true

[*.{csproj,props,targets}]
indent_style = space
indent_size = 2

[*.yml]
indent_style = space
indent_size = 2

[*.cs]
charset = utf-8-bom
insert_final_newline = true
indent_style = space
indent_size = 4

# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
dotnet_separate_import_directive_groups = false
csharp_using_directive_placement = inside_namespace:none

# Always use "this." and "Me." when applicable; let StyleCop Analyzers provide the warning and fix
dotnet_style_qualification_for_field = true:none
dotnet_style_qualification_for_property = true:none
dotnet_style_qualification_for_method = true:none
dotnet_style_qualification_for_event = true:none

# Use language keywords where applicable; let StyleCop Analyzers provide the warning and fix
dotnet_style_predefined_type_for_locals_parameters_members = true:none
dotnet_style_predefined_type_for_member_access = true:none

# Suggest more modern language features when available
dotnet_style_object_initializer = true:none
dotnet_style_collection_initializer = true:none
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion

# 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_switch_labels = false
csharp_indent_labels = flush_left

# 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

# Prefer "var" only where type is obvious; disable diagnostics since no firm policy is in place yet
csharp_style_var_for_built_in_types = false:none
csharp_style_var_when_type_is_apparent = true:none
csharp_style_var_elsewhere = false:none

# Prefer method-like constructs to have a block body
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none

# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Suggest more modern language features when available
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:none
csharp_style_throw_expression = true:none
csharp_style_conditional_delegate_call = true:suggestion
2 changes: 1 addition & 1 deletion ConfigApp/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Windows;
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
Expand Down
2 changes: 1 addition & 1 deletion ConfigApp/Effects.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ConfigApp
namespace ConfigApp
{
public static class Effects
{
Expand Down
57 changes: 28 additions & 29 deletions ConfigApp/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using ConfigApp.Tabs;
using ConfigApp.Tabs.Voting;
using System.IO;
using System.IO;
using System.Net.Http;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;

using ConfigApp.Tabs;
using ConfigApp.Tabs.Voting;
using static ConfigApp.Effects;

namespace ConfigApp
Expand Down Expand Up @@ -271,30 +270,30 @@ private void InitEffectsTreeView()

switch (effectMisc.EffectCategory)
{
case EffectCategory.Player:
playerParentItem.AddChild(menuItem);
break;
case EffectCategory.Vehicle:
vehicleParentItem.AddChild(menuItem);
break;
case EffectCategory.Peds:
pedsParentItem.AddChild(menuItem);
break;
case EffectCategory.Screen:
screenParentItem.AddChild(menuItem);
break;
case EffectCategory.Time:
timeParentItem.AddChild(menuItem);
break;
case EffectCategory.Weather:
weatherParentItem.AddChild(menuItem);
break;
case EffectCategory.Misc:
miscParentItem.AddChild(menuItem);
break;
case EffectCategory.Meta:
metaParentItem.AddChild(menuItem);
break;
case EffectCategory.Player:
playerParentItem.AddChild(menuItem);
break;
case EffectCategory.Vehicle:
vehicleParentItem.AddChild(menuItem);
break;
case EffectCategory.Peds:
pedsParentItem.AddChild(menuItem);
break;
case EffectCategory.Screen:
screenParentItem.AddChild(menuItem);
break;
case EffectCategory.Time:
timeParentItem.AddChild(menuItem);
break;
case EffectCategory.Weather:
weatherParentItem.AddChild(menuItem);
break;
case EffectCategory.Misc:
miscParentItem.AddChild(menuItem);
break;
case EffectCategory.Meta:
metaParentItem.AddChild(menuItem);
break;
}
}

Expand Down Expand Up @@ -427,4 +426,4 @@ public void OpenModPageEvent(object sender, RoutedEventArgs eventArgs)
System.Diagnostics.Process.Start("https://www.gta5-mods.com/scripts/chaos-mod-v-beta");
}
}
}
}
4 changes: 2 additions & 2 deletions ConfigApp/OptionsManager.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Shared;
using System.IO;
using System.IO;
using Shared;

namespace ConfigApp
{
Expand Down
11 changes: 5 additions & 6 deletions ConfigApp/Tabs/WorkshopTab.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using Microsoft.CSharp.RuntimeBinder;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using System.IO;
using System.Net.Http;
using System.Security.Cryptography;
Expand All @@ -11,9 +8,11 @@
using System.Windows.Data;
using System.Windows.Markup;
using System.Windows.Media;
using Microsoft.CSharp.RuntimeBinder;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Xceed.Wpf.Toolkit;
using ZstdSharp;

using MessageBox = System.Windows.MessageBox;

namespace ConfigApp.Tabs
Expand Down Expand Up @@ -494,4 +493,4 @@ public async override void OnTabSelected()
}
}
}
}
}
30 changes: 15 additions & 15 deletions ConfigApp/WorkshopEditDialog.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,22 @@ TreeMenuItem generateItem(string text, TreeMenuItem? parent = null)
bool isConfigurable = false;
switch (pathName[^4..])
{
case ".lua":
targetItem = luaParentItem;
isConfigurable = true;
break;
case ".mp3":
targetItem = mp3ParentItem;
break;
case ".txt":
if (m_DialogMode != WorkshopEditDialogMode.Install)
{
continue;
}
targetItem = txtParentItem;
break;
default:
case ".lua":
targetItem = luaParentItem;
isConfigurable = true;
break;
case ".mp3":
targetItem = mp3ParentItem;
break;
case ".txt":
if (m_DialogMode != WorkshopEditDialogMode.Install)
{
continue;
}
targetItem = txtParentItem;
break;
default:
continue;
}

if (pathFragments.Length > 1)
Expand Down
4 changes: 2 additions & 2 deletions ConfigApp/WorkshopInstallHandler.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Newtonsoft.Json.Linq;
using System.IO;
using System.IO;
using System.IO.Compression;
using System.Media;
using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Windows;
using System.Windows.Input;
using Newtonsoft.Json.Linq;
using ZstdSharp;

namespace ConfigApp
Expand Down
6 changes: 3 additions & 3 deletions ConfigApp/WorkshopSettingsHandler.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.IO;
using System.IO;
using System.Windows;
using System.Windows.Input;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace ConfigApp
{
Expand Down
46 changes: 23 additions & 23 deletions ConfigApp/WorkshopSubmissionItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,29 @@ public SubmissionInstallState InstallState

switch (value)
{
case SubmissionInstallState.NotInstalled:
InstallButtonText = "Install";
InstallButtonEnabled = !IsAlien;
SettingsButtonVisibility = Visibility.Hidden;
break;
case SubmissionInstallState.Installed:
InstallButtonText = "Remove";
InstallButtonEnabled = true;
SettingsButtonVisibility = Visibility.Visible;
break;
case SubmissionInstallState.Installing:
InstallButtonText = "Installing";
InstallButtonEnabled = false;
break;
case SubmissionInstallState.UpdateAvailable:
InstallButtonText = "Update";
InstallButtonEnabled = !IsAlien;
SettingsButtonVisibility = Visibility.Visible;
break;
case SubmissionInstallState.Removing:
InstallButtonText = "Removing";
InstallButtonEnabled = false;
break;
case SubmissionInstallState.NotInstalled:
InstallButtonText = "Install";
InstallButtonEnabled = !IsAlien;
SettingsButtonVisibility = Visibility.Hidden;
break;
case SubmissionInstallState.Installed:
InstallButtonText = "Remove";
InstallButtonEnabled = true;
SettingsButtonVisibility = Visibility.Visible;
break;
case SubmissionInstallState.Installing:
InstallButtonText = "Installing";
InstallButtonEnabled = false;
break;
case SubmissionInstallState.UpdateAvailable:
InstallButtonText = "Update";
InstallButtonEnabled = !IsAlien;
SettingsButtonVisibility = Visibility.Visible;
break;
case SubmissionInstallState.Removing:
InstallButtonText = "Removing";
InstallButtonEnabled = false;
break;
}

PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InstallButtonText)));
Expand Down
Loading

0 comments on commit f24ce91

Please sign in to comment.