Skip to content

Commit

Permalink
Added editorconfig and applied code cleanup for C# sources.
Browse files Browse the repository at this point in the history
  • Loading branch information
sanosdole committed Mar 30, 2021
1 parent ec1b90a commit 8e5d996
Show file tree
Hide file tree
Showing 80 changed files with 3,035 additions and 3,005 deletions.
123 changes: 123 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
###############################
# Core EditorConfig Options #
###############################
# All files
[*]
indent_style = space
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
###############################
# .NET Coding Conventions #
###############################
[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
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_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
###############################
# Naming Conventions #
###############################
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
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.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const
###############################
# C# Coding Conventions #
###############################
[*.cs]
# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
###############################
# C# Formatting Rules #
###############################
# 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 = false
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
###############################
# VB Coding Conventions #
###############################
[*.vb]
# Modifier preferences
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ public static void AddComponent<TComponent>(this IComponentsApplicationBuilder a
app.AddComponent(typeof(TComponent), domElementSelector);
}
}
}
}
9 changes: 3 additions & 6 deletions ElectronHostedBlazor/Builder/IComponentsApplicationBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Modified by Daniel Martin for nodeclrhost

using System;
using Microsoft.AspNetCore.Components;

namespace ElectronHostedBlazor.Builder
{
using System;
using Microsoft.AspNetCore.Components;

/// <summary>
/// A builder for adding components to an application.
/// </summary>
Expand All @@ -27,5 +26,3 @@ public interface IComponentsApplicationBuilder
void AddComponent(Type componentType, string domElementSelector);
}
}


3 changes: 1 addition & 2 deletions ElectronHostedBlazor/Hosting/BlazorElectronHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace ElectronHostedBlazor.Hosting
{

public static class BlazorElectronHost
{
/// <summary>
Expand All @@ -16,4 +15,4 @@ public static IElectronHostBuilder CreateDefaultBuilder()
return new ElectronHostBuilder();
}
}
}
}
42 changes: 21 additions & 21 deletions ElectronHostedBlazor/Hosting/ConventionBasedStartup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace ElectronHostedBlazor.Hosting
using System.Linq;
using System.Reflection;
using System.Runtime.ExceptionServices;
using ElectronHostedBlazor.Builder;
using Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;

Expand Down Expand Up @@ -46,8 +46,8 @@ public void Configure(IComponentsApplicationBuilder app, IServiceProvider servic
{
var parameter = parameters[i];
arguments[i] = parameter.ParameterType == typeof(IComponentsApplicationBuilder)
? app
: services.GetRequiredService(parameter.ParameterType);
? app
: services.GetRequiredService(parameter.ParameterType);
}

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

if (methods.Length == 1)
{
Expand All @@ -91,7 +91,7 @@ public void ConfigureServices(IServiceCollection services)
var method = GetConfigureServicesMethod();
if (method != null)
{
method.Invoke(Instance, new object[] { services });
method.Invoke(Instance, new object[] { services });
}
}
catch (Exception ex)
Expand All @@ -112,7 +112,7 @@ public void ConfigureLogging(ILoggingBuilder loggingBuilder)
var method = GetConfigureLoggingMethod();
if (method != null)
{
method.Invoke(Instance, new object[] { loggingBuilder });
method.Invoke(Instance, new object[] { loggingBuilder });
}
}
catch (Exception ex)
Expand All @@ -129,23 +129,23 @@ public void ConfigureLogging(ILoggingBuilder loggingBuilder)
internal MethodInfo GetConfigureServicesMethod()
{
return Instance.GetType()
.GetMethod(
"ConfigureServices",
BindingFlags.Public | BindingFlags.Instance,
null,
new Type[] { typeof(IServiceCollection), },
Array.Empty<ParameterModifier>());
.GetMethod(
"ConfigureServices",
BindingFlags.Public | BindingFlags.Instance,
null,
new Type[] { typeof(IServiceCollection), },
Array.Empty<ParameterModifier>());
}

internal MethodInfo GetConfigureLoggingMethod()
{
return Instance.GetType()
.GetMethod(
"ConfigureLogging",
BindingFlags.Public | BindingFlags.Instance,
null,
new Type[] { typeof(ILoggingBuilder), },
Array.Empty<ParameterModifier>());
.GetMethod(
"ConfigureLogging",
BindingFlags.Public | BindingFlags.Instance,
null,
new Type[] { typeof(ILoggingBuilder), },
Array.Empty<ParameterModifier>());
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ namespace ElectronHostedBlazor.Hosting
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using ElectronHostedBlazor.Builder;
using ElectronHostedBlazor.Rendering;
using Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NodeHostEnvironment;
using Rendering;

internal class ElectronBlazorApplicationBuilder : IComponentsApplicationBuilder
{
Expand Down Expand Up @@ -53,4 +53,4 @@ public async Task<ElectronRenderer> CreateRendererAsync()
return renderer;
}
}
}
}
10 changes: 4 additions & 6 deletions ElectronHostedBlazor/Hosting/ElectronHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public ElectronHost(IServiceProvider services, IJSRuntime runtime, IBridgeToNode
public event UnhandledExceptionEventHandler UnhandledException;

public async Task RunAsync(CancellationToken cancellationToken = default)
{
{
var scopeFactory = Services.GetRequiredService<IServiceScopeFactory>();
using (var _scope = scopeFactory.CreateScope())
{
Expand All @@ -46,16 +46,15 @@ public async Task RunAsync(CancellationToken cancellationToken = default)
var builder = new ElectronBlazorApplicationBuilder(_scope.ServiceProvider);
startup.Configure(builder, _scope.ServiceProvider);

using(var _renderer = await builder.CreateRendererAsync())
using (var _renderer = await builder.CreateRendererAsync())
{
_renderer.UnhandledSynchronizationException += OnUnhandledRendererException;
var tcs = new TaskCompletionSource<object>();
_node.Global.window.addEventListener("unload",
new Action<dynamic>(e => tcs.SetResult(0)));
new Action<dynamic>(e => tcs.SetResult(0)));
await tcs.Task;
}
}

}

private void OnUnhandledRendererException(object sender, UnhandledExceptionEventArgs e)
Expand All @@ -68,5 +67,4 @@ public void Dispose()
(Services as IDisposable)?.Dispose();
}
}

}
}
Loading

0 comments on commit 8e5d996

Please sign in to comment.