Skip to content

Commit 8e5d996

Browse files
sanosdolesanosdole
committed
Added editorconfig and applied code cleanup for C# sources.
1 parent ec1b90a commit 8e5d996

File tree

80 files changed

+3035
-3005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+3035
-3005
lines changed

‎.editorconfig

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
# Code files
9+
[*.{cs,csx,vb,vbx}]
10+
indent_size = 4
11+
insert_final_newline = true
12+
charset = utf-8-bom
13+
###############################
14+
# .NET Coding Conventions #
15+
###############################
16+
[*.{cs,vb}]
17+
# Organize usings
18+
dotnet_sort_system_directives_first = true
19+
# this. preferences
20+
dotnet_style_qualification_for_field = false:silent
21+
dotnet_style_qualification_for_property = false:silent
22+
dotnet_style_qualification_for_method = false:silent
23+
dotnet_style_qualification_for_event = false:silent
24+
# Language keywords vs BCL types preferences
25+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
26+
dotnet_style_predefined_type_for_member_access = true:silent
27+
# Parentheses preferences
28+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
29+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
30+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
31+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
32+
# Modifier preferences
33+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
34+
dotnet_style_readonly_field = true:suggestion
35+
# Expression-level preferences
36+
dotnet_style_object_initializer = true:suggestion
37+
dotnet_style_collection_initializer = true:suggestion
38+
dotnet_style_explicit_tuple_names = true:suggestion
39+
dotnet_style_null_propagation = true:suggestion
40+
dotnet_style_coalesce_expression = true:suggestion
41+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
42+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
43+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
44+
dotnet_style_prefer_auto_properties = true:silent
45+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
46+
dotnet_style_prefer_conditional_expression_over_return = true:silent
47+
###############################
48+
# Naming Conventions #
49+
###############################
50+
# Style Definitions
51+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
52+
# Use PascalCase for constant fields
53+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
54+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
55+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
56+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
57+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
58+
dotnet_naming_symbols.constant_fields.required_modifiers = const
59+
###############################
60+
# C# Coding Conventions #
61+
###############################
62+
[*.cs]
63+
# var preferences
64+
csharp_style_var_for_built_in_types = true:silent
65+
csharp_style_var_when_type_is_apparent = true:silent
66+
csharp_style_var_elsewhere = true:silent
67+
# Expression-bodied members
68+
csharp_style_expression_bodied_methods = false:silent
69+
csharp_style_expression_bodied_constructors = false:silent
70+
csharp_style_expression_bodied_operators = false:silent
71+
csharp_style_expression_bodied_properties = true:silent
72+
csharp_style_expression_bodied_indexers = true:silent
73+
csharp_style_expression_bodied_accessors = true:silent
74+
# Pattern matching preferences
75+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
76+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
77+
# Null-checking preferences
78+
csharp_style_throw_expression = true:suggestion
79+
csharp_style_conditional_delegate_call = true:suggestion
80+
# Modifier preferences
81+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
82+
# Expression-level preferences
83+
csharp_prefer_braces = true:silent
84+
csharp_style_deconstructed_variable_declaration = true:suggestion
85+
csharp_prefer_simple_default_expression = true:suggestion
86+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
87+
csharp_style_inlined_variable_declaration = true:suggestion
88+
###############################
89+
# C# Formatting Rules #
90+
###############################
91+
# New line preferences
92+
csharp_new_line_before_open_brace = all
93+
csharp_new_line_before_else = true
94+
csharp_new_line_before_catch = true
95+
csharp_new_line_before_finally = true
96+
csharp_new_line_before_members_in_object_initializers = true
97+
csharp_new_line_before_members_in_anonymous_types = true
98+
csharp_new_line_between_query_expression_clauses = true
99+
# Indentation preferences
100+
csharp_indent_case_contents = true
101+
csharp_indent_switch_labels = true
102+
csharp_indent_labels = flush_left
103+
# Space preferences
104+
csharp_space_after_cast = false
105+
csharp_space_after_keywords_in_control_flow_statements = true
106+
csharp_space_between_method_call_parameter_list_parentheses = false
107+
csharp_space_between_method_declaration_parameter_list_parentheses = false
108+
csharp_space_between_parentheses = false
109+
csharp_space_before_colon_in_inheritance_clause = true
110+
csharp_space_after_colon_in_inheritance_clause = true
111+
csharp_space_around_binary_operators = before_and_after
112+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
113+
csharp_space_between_method_call_name_and_opening_parenthesis = false
114+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
115+
# Wrapping preferences
116+
csharp_preserve_single_line_statements = true
117+
csharp_preserve_single_line_blocks = true
118+
###############################
119+
# VB Coding Conventions #
120+
###############################
121+
[*.vb]
122+
# Modifier preferences
123+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

‎ElectronHostedBlazor/Builder/ComponentsApplicationBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public static void AddComponent<TComponent>(this IComponentsApplicationBuilder a
2424
app.AddComponent(typeof(TComponent), domElementSelector);
2525
}
2626
}
27-
}
27+
}

‎ElectronHostedBlazor/Builder/IComponentsApplicationBuilder.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
21
// Copyright (c) .NET Foundation. All rights reserved.
32
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
43
// Modified by Daniel Martin for nodeclrhost
54

6-
using System;
7-
using Microsoft.AspNetCore.Components;
8-
95
namespace ElectronHostedBlazor.Builder
106
{
7+
using System;
8+
using Microsoft.AspNetCore.Components;
9+
1110
/// <summary>
1211
/// A builder for adding components to an application.
1312
/// </summary>
@@ -27,5 +26,3 @@ public interface IComponentsApplicationBuilder
2726
void AddComponent(Type componentType, string domElementSelector);
2827
}
2928
}
30-
31-

‎ElectronHostedBlazor/Hosting/BlazorElectronHost.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace ElectronHostedBlazor.Hosting
66
{
7-
87
public static class BlazorElectronHost
98
{
109
/// <summary>
@@ -16,4 +15,4 @@ public static IElectronHostBuilder CreateDefaultBuilder()
1615
return new ElectronHostBuilder();
1716
}
1817
}
19-
}
18+
}

‎ElectronHostedBlazor/Hosting/ConventionBasedStartup.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace ElectronHostedBlazor.Hosting
99
using System.Linq;
1010
using System.Reflection;
1111
using System.Runtime.ExceptionServices;
12-
using ElectronHostedBlazor.Builder;
12+
using Builder;
1313
using Microsoft.Extensions.DependencyInjection;
1414
using Microsoft.Extensions.Logging;
1515

@@ -46,8 +46,8 @@ public void Configure(IComponentsApplicationBuilder app, IServiceProvider servic
4646
{
4747
var parameter = parameters[i];
4848
arguments[i] = parameter.ParameterType == typeof(IComponentsApplicationBuilder)
49-
? app
50-
: services.GetRequiredService(parameter.ParameterType);
49+
? app
50+
: services.GetRequiredService(parameter.ParameterType);
5151
}
5252

5353
method.Invoke(Instance, arguments);
@@ -66,9 +66,9 @@ public void Configure(IComponentsApplicationBuilder app, IServiceProvider servic
6666
internal MethodInfo GetConfigureMethod()
6767
{
6868
var methods = Instance.GetType()
69-
.GetMethods(BindingFlags.Instance | BindingFlags.Public)
70-
.Where(m => string.Equals(m.Name, "Configure", StringComparison.Ordinal))
71-
.ToArray();
69+
.GetMethods(BindingFlags.Instance | BindingFlags.Public)
70+
.Where(m => string.Equals(m.Name, "Configure", StringComparison.Ordinal))
71+
.ToArray();
7272

7373
if (methods.Length == 1)
7474
{
@@ -91,7 +91,7 @@ public void ConfigureServices(IServiceCollection services)
9191
var method = GetConfigureServicesMethod();
9292
if (method != null)
9393
{
94-
method.Invoke(Instance, new object[] { services });
94+
method.Invoke(Instance, new object[] { services });
9595
}
9696
}
9797
catch (Exception ex)
@@ -112,7 +112,7 @@ public void ConfigureLogging(ILoggingBuilder loggingBuilder)
112112
var method = GetConfigureLoggingMethod();
113113
if (method != null)
114114
{
115-
method.Invoke(Instance, new object[] { loggingBuilder });
115+
method.Invoke(Instance, new object[] { loggingBuilder });
116116
}
117117
}
118118
catch (Exception ex)
@@ -129,23 +129,23 @@ public void ConfigureLogging(ILoggingBuilder loggingBuilder)
129129
internal MethodInfo GetConfigureServicesMethod()
130130
{
131131
return Instance.GetType()
132-
.GetMethod(
133-
"ConfigureServices",
134-
BindingFlags.Public | BindingFlags.Instance,
135-
null,
136-
new Type[] { typeof(IServiceCollection), },
137-
Array.Empty<ParameterModifier>());
132+
.GetMethod(
133+
"ConfigureServices",
134+
BindingFlags.Public | BindingFlags.Instance,
135+
null,
136+
new Type[] { typeof(IServiceCollection), },
137+
Array.Empty<ParameterModifier>());
138138
}
139139

140140
internal MethodInfo GetConfigureLoggingMethod()
141141
{
142142
return Instance.GetType()
143-
.GetMethod(
144-
"ConfigureLogging",
145-
BindingFlags.Public | BindingFlags.Instance,
146-
null,
147-
new Type[] { typeof(ILoggingBuilder), },
148-
Array.Empty<ParameterModifier>());
143+
.GetMethod(
144+
"ConfigureLogging",
145+
BindingFlags.Public | BindingFlags.Instance,
146+
null,
147+
new Type[] { typeof(ILoggingBuilder), },
148+
Array.Empty<ParameterModifier>());
149149
}
150150
}
151-
}
151+
}

‎ElectronHostedBlazor/Hosting/ElectronBlazorApplicationBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ namespace ElectronHostedBlazor.Hosting
77
using System;
88
using System.Collections.Generic;
99
using System.Threading.Tasks;
10-
using ElectronHostedBlazor.Builder;
11-
using ElectronHostedBlazor.Rendering;
10+
using Builder;
1211
using Microsoft.Extensions.DependencyInjection;
1312
using Microsoft.Extensions.Logging;
1413
using NodeHostEnvironment;
14+
using Rendering;
1515

1616
internal class ElectronBlazorApplicationBuilder : IComponentsApplicationBuilder
1717
{
@@ -53,4 +53,4 @@ public async Task<ElectronRenderer> CreateRendererAsync()
5353
return renderer;
5454
}
5555
}
56-
}
56+
}

‎ElectronHostedBlazor/Hosting/ElectronHost.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ElectronHost(IServiceProvider services, IJSRuntime runtime, IBridgeToNode
2828
public event UnhandledExceptionEventHandler UnhandledException;
2929

3030
public async Task RunAsync(CancellationToken cancellationToken = default)
31-
{
31+
{
3232
var scopeFactory = Services.GetRequiredService<IServiceScopeFactory>();
3333
using (var _scope = scopeFactory.CreateScope())
3434
{
@@ -46,16 +46,15 @@ public async Task RunAsync(CancellationToken cancellationToken = default)
4646
var builder = new ElectronBlazorApplicationBuilder(_scope.ServiceProvider);
4747
startup.Configure(builder, _scope.ServiceProvider);
4848

49-
using(var _renderer = await builder.CreateRendererAsync())
49+
using (var _renderer = await builder.CreateRendererAsync())
5050
{
5151
_renderer.UnhandledSynchronizationException += OnUnhandledRendererException;
5252
var tcs = new TaskCompletionSource<object>();
5353
_node.Global.window.addEventListener("unload",
54-
new Action<dynamic>(e => tcs.SetResult(0)));
54+
new Action<dynamic>(e => tcs.SetResult(0)));
5555
await tcs.Task;
5656
}
5757
}
58-
5958
}
6059

6160
private void OnUnhandledRendererException(object sender, UnhandledExceptionEventArgs e)
@@ -68,5 +67,4 @@ public void Dispose()
6867
(Services as IDisposable)?.Dispose();
6968
}
7069
}
71-
72-
}
70+
}

0 commit comments

Comments
 (0)