From fdaf7518c600240c132939d3817b14c134b5784d Mon Sep 17 00:00:00 2001 From: nsnail Date: Tue, 29 Nov 2022 18:00:52 +0800 Subject: [PATCH] style --- doc/README.md | 1 - lib/README.md | 1 - res/README.md | 1 - script/README.md | 1 - src/.editorconfig | 2 +- src/NSExt.sln | 4 ++-- src/NSExt.sln.DotSettings | 2 +- src/NSExt/Extensions/ByteExtensions.cs | 8 ++------ src/NSExt/Extensions/CharExtensions.cs | 12 ++---------- src/NSExt/Extensions/DateTimeExtensions.cs | 9 ++------- src/NSExt/Extensions/DbCommandExtensions.cs | 11 ++--------- src/NSExt/Extensions/DecimalExtensions.cs | 12 ++---------- src/NSExt/Extensions/EnumExtensions.cs | 11 ++--------- src/NSExt/Extensions/EnumerableExtensions.cs | 11 ++--------- src/NSExt/Extensions/GenericExtensions.cs | 12 ++---------- src/NSExt/Extensions/IntExtensions.cs | 11 ++--------- .../Extensions/JsonSerializerOptionsExtensions.cs | 8 ++------ src/NSExt/Extensions/LoggerExtensions.cs | 11 ++--------- src/NSExt/Extensions/LongExtensions.cs | 12 ++---------- src/NSExt/Extensions/ObjectExtensions.cs | 9 ++------- src/NSExt/Extensions/StreamExtensions.cs | 8 ++------ src/NSExt/Extensions/StringExtensions.cs | 8 ++------ src/NSExt/Extensions/TypeExtensions.cs | 8 ++------ src/NSExt/Extensions/UriExtensions.cs | 13 ++----------- src/NSExt/GlobalUsings.cs | 4 ++-- src/README.md | 1 - 26 files changed, 40 insertions(+), 151 deletions(-) diff --git a/doc/README.md b/doc/README.md index 8b13789..e69de29 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1 +0,0 @@ - diff --git a/lib/README.md b/lib/README.md index 8b13789..e69de29 100644 --- a/lib/README.md +++ b/lib/README.md @@ -1 +0,0 @@ - diff --git a/res/README.md b/res/README.md index 8b13789..e69de29 100644 --- a/res/README.md +++ b/res/README.md @@ -1 +0,0 @@ - diff --git a/script/README.md b/script/README.md index 8b13789..e69de29 100644 --- a/script/README.md +++ b/script/README.md @@ -1 +0,0 @@ - diff --git a/src/.editorconfig b/src/.editorconfig index 60c2173..bf1a983 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -86,4 +86,4 @@ resharper_wrap_object_and_collection_initializer_style = chop_always [*.cs] indent_style = space indent_size = 4 -tab_width = 4 +tab_width = 4 \ No newline at end of file diff --git a/src/NSExt.sln b/src/NSExt.sln index 25a57b6..fcf94ce 100644 --- a/src/NSExt.sln +++ b/src/NSExt.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSExt", "NSExt\NSExt.csproj", "{54814D1B-C587-4D90-A7BE-4BE1E170D5FC}" EndProject @@ -13,4 +13,4 @@ Global {54814D1B-C587-4D90-A7BE-4BE1E170D5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {54814D1B-C587-4D90-A7BE-4BE1E170D5FC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection -EndGlobal +EndGlobal \ No newline at end of file diff --git a/src/NSExt.sln.DotSettings b/src/NSExt.sln.DotSettings index bc7c36a..e09be4f 100644 --- a/src/NSExt.sln.DotSettings +++ b/src/NSExt.sln.DotSettings @@ -1,4 +1,4 @@ - + DO_NOT_SHOW DO_NOT_SHOW <?xml version="1.0" encoding="utf-16"?><Profile name="Built-in: Full Cleanup With File Header"><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><CppAddTypenameTemplateKeywords>True</CppAddTypenameTemplateKeywords><CppRemoveCastDescriptor>True</CppRemoveCastDescriptor><CppRemoveElseKeyword>True</CppRemoveElseKeyword><CppShortenQualifiedName>True</CppShortenQualifiedName><CppDeleteRedundantSpecifier>True</CppDeleteRedundantSpecifier><CppRemoveStatement>True</CppRemoveStatement><CppDeleteRedundantTypenameTemplateKeywords>True</CppDeleteRedundantTypenameTemplateKeywords><CppCStyleToStaticCastDescriptor>True</CppCStyleToStaticCastDescriptor><CppReplaceExpressionWithBooleanConst>True</CppReplaceExpressionWithBooleanConst><CppMakeIfConstexpr>True</CppMakeIfConstexpr><CppMakePostfixOperatorPrefix>True</CppMakePostfixOperatorPrefix><CppChangeSmartPointerToMakeFunction>True</CppChangeSmartPointerToMakeFunction><CppReplaceThrowWithRethrowFix>True</CppReplaceThrowWithRethrowFix><CppTypeTraitAliasDescriptor>True</CppTypeTraitAliasDescriptor><CppReplaceExpressionWithNullptr>True</CppReplaceExpressionWithNullptr><CppReplaceTieWithStructuredBindingDescriptor>True</CppReplaceTieWithStructuredBindingDescriptor><CppUseAssociativeContainsDescriptor>True</CppUseAssociativeContainsDescriptor><CppUseEraseAlgorithmDescriptor>True</CppUseEraseAlgorithmDescriptor><CppCodeStyleCleanupDescriptor ArrangeBraces="True" ArrangeAuto="True" ArrangeFunctionDeclarations="True" ArrangeNestedNamespaces="True" ArrangeTypeAliases="True" ArrangeCVQualifiers="True" ArrangeSlashesInIncludeDirectives="True" ArrangeOverridingFunctions="True" SortIncludeDirectives="True" SortMemberInitializers="True" /><CppReformatCode>True</CppReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /><RemoveCodeRedundanciesVB>True</RemoveCodeRedundanciesVB><Xaml.RedundantFreezeAttribute>True</Xaml.RedundantFreezeAttribute><Xaml.RemoveRedundantModifiersAttribute>True</Xaml.RemoveRedundantModifiersAttribute><Xaml.RemoveRedundantNameAttribute>True</Xaml.RemoveRedundantNameAttribute><Xaml.RemoveRedundantResource>True</Xaml.RemoveRedundantResource><Xaml.RemoveRedundantCollectionProperty>True</Xaml.RemoveRedundantCollectionProperty><Xaml.RemoveRedundantAttachedPropertySetter>True</Xaml.RemoveRedundantAttachedPropertySetter><Xaml.RemoveRedundantStyledValue>True</Xaml.RemoveRedundantStyledValue><Xaml.RemoveRedundantNamespaceAlias>True</Xaml.RemoveRedundantNamespaceAlias><Xaml.RemoveForbiddenResourceName>True</Xaml.RemoveForbiddenResourceName><Xaml.RemoveRedundantGridDefinitionsAttribute>True</Xaml.RemoveRedundantGridDefinitionsAttribute><Xaml.RemoveRedundantUpdateSourceTriggerAttribute>True</Xaml.RemoveRedundantUpdateSourceTriggerAttribute><Xaml.RemoveRedundantBindingModeAttribute>True</Xaml.RemoveRedundantBindingModeAttribute><Xaml.RemoveRedundantGridSpanAttribut>True</Xaml.RemoveRedundantGridSpanAttribut><XMLReformatCode>True</XMLReformatCode><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><HtmlReformatCode>True</HtmlReformatCode><VBOptimizeImports>True</VBOptimizeImports><VBShortenReferences>True</VBShortenReferences><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><VBReformatCode>True</VBReformatCode><VBFormatDocComments>True</VBFormatDocComments><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><IDEA_SETTINGS>&lt;profile version="1.0"&gt; diff --git a/src/NSExt/Extensions/ByteExtensions.cs b/src/NSExt/Extensions/ByteExtensions.cs index 2c28d3e..884dfa5 100644 --- a/src/NSExt/Extensions/ByteExtensions.cs +++ b/src/NSExt/Extensions/ByteExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class ByteExtensions { @@ -34,8 +34,4 @@ public static class ByteExtensions { return me.HexDe(Encoding.UTF8); } -} - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/CharExtensions.cs b/src/NSExt/Extensions/CharExtensions.cs index 911c50b..319cf91 100644 --- a/src/NSExt/Extensions/CharExtensions.cs +++ b/src/NSExt/Extensions/CharExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class CharExtensions { @@ -21,12 +21,4 @@ public static class CharExtensions { return IsAsciiLetterOrDigit(me) || me is '+' or '/' or '='; } -} - - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/DateTimeExtensions.cs b/src/NSExt/Extensions/DateTimeExtensions.cs index 5412ccf..2e904b2 100644 --- a/src/NSExt/Extensions/DateTimeExtensions.cs +++ b/src/NSExt/Extensions/DateTimeExtensions.cs @@ -1,4 +1,4 @@ -// ReSharper disable UnusedMember.Global +// ReSharper disable UnusedMember.Global namespace NSExt.Extensions; @@ -86,9 +86,4 @@ public static class DateTimeExtensions { return me.ToString("yyyyMMdd"); } -} - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/DbCommandExtensions.cs b/src/NSExt/Extensions/DbCommandExtensions.cs index 468d1d3..c7cc4c8 100644 --- a/src/NSExt/Extensions/DbCommandExtensions.cs +++ b/src/NSExt/Extensions/DbCommandExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class DbCommandExtensions { @@ -26,11 +26,4 @@ public static class DbCommandExtensions return sql; } -} - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/DecimalExtensions.cs b/src/NSExt/Extensions/DecimalExtensions.cs index 5263fda..3695204 100644 --- a/src/NSExt/Extensions/DecimalExtensions.cs +++ b/src/NSExt/Extensions/DecimalExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class DecimalExtensions { @@ -13,12 +13,4 @@ public static class DecimalExtensions var dec = Math.Round(me, place); return dec; } -} - - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/EnumExtensions.cs b/src/NSExt/Extensions/EnumExtensions.cs index 6358130..a7e5827 100644 --- a/src/NSExt/Extensions/EnumExtensions.cs +++ b/src/NSExt/Extensions/EnumExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class EnumExtensions { @@ -14,11 +14,4 @@ public static class EnumExtensions var attrs = (DescriptionAttribute[])fi!.GetCustomAttributes(typeof(DescriptionAttribute), false); return (attrs.Length != 0 ? attrs[0].Description : Enum.GetName(t, e)) ?? ""; } -} - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/EnumerableExtensions.cs b/src/NSExt/Extensions/EnumerableExtensions.cs index fd0b72f..067f057 100644 --- a/src/NSExt/Extensions/EnumerableExtensions.cs +++ b/src/NSExt/Extensions/EnumerableExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class EnumerableExtensions { @@ -23,11 +23,4 @@ public static class EnumerableExtensions { return me is null || !me.Any(); } -} - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/GenericExtensions.cs b/src/NSExt/Extensions/GenericExtensions.cs index 1943203..e378ef1 100644 --- a/src/NSExt/Extensions/GenericExtensions.cs +++ b/src/NSExt/Extensions/GenericExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class GenericExtensions { @@ -40,12 +40,4 @@ public static class GenericExtensions { return me.Equals(compare) ? ret : me; } -} - - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/IntExtensions.cs b/src/NSExt/Extensions/IntExtensions.cs index 5877cf3..5f80e42 100644 --- a/src/NSExt/Extensions/IntExtensions.cs +++ b/src/NSExt/Extensions/IntExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class IntExtensions { @@ -33,11 +33,4 @@ public static class IntExtensions { return string.Join(".", BitConverter.GetBytes(me).Reverse()); } -} - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/JsonSerializerOptionsExtensions.cs b/src/NSExt/Extensions/JsonSerializerOptionsExtensions.cs index b989f96..7649079 100644 --- a/src/NSExt/Extensions/JsonSerializerOptionsExtensions.cs +++ b/src/NSExt/Extensions/JsonSerializerOptionsExtensions.cs @@ -1,4 +1,4 @@ -using System.Text.Encodings.Web; +using System.Text.Encodings.Web; using System.Text.Json; using System.Text.Json.Serialization; @@ -18,8 +18,4 @@ public static class JsonSerializerOptionsExtensions PropertyNameCaseInsensitive = true }; } -} - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/LoggerExtensions.cs b/src/NSExt/Extensions/LoggerExtensions.cs index 46bb32c..a74b89b 100644 --- a/src/NSExt/Extensions/LoggerExtensions.cs +++ b/src/NSExt/Extensions/LoggerExtensions.cs @@ -1,4 +1,4 @@ -// ReSharper disable TemplateIsNotCompileTimeConstantProblem +// ReSharper disable TemplateIsNotCompileTimeConstantProblem namespace NSExt.Extensions; @@ -63,11 +63,4 @@ public static class LoggerExtensions { me.LogWarning(CallerInfoMessage(message, callerName, callerFilePath, callerLineNumber)); } -} - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/LongExtensions.cs b/src/NSExt/Extensions/LongExtensions.cs index 088486f..e726f72 100644 --- a/src/NSExt/Extensions/LongExtensions.cs +++ b/src/NSExt/Extensions/LongExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class LongExtensions { @@ -24,12 +24,4 @@ public static class LongExtensions { return new DateTime(1970, 1, 1).AddMilliseconds(msFrom1970).ToLocalTime(); } -} - - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/ObjectExtensions.cs b/src/NSExt/Extensions/ObjectExtensions.cs index 6e865f6..ce3a187 100644 --- a/src/NSExt/Extensions/ObjectExtensions.cs +++ b/src/NSExt/Extensions/ObjectExtensions.cs @@ -1,4 +1,4 @@ -using System.Text.Json; +using System.Text.Json; namespace NSExt.Extensions; @@ -18,9 +18,4 @@ public static class ObjectExtensions PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); } -} - - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/StreamExtensions.cs b/src/NSExt/Extensions/StreamExtensions.cs index 273580c..21dfd6e 100644 --- a/src/NSExt/Extensions/StreamExtensions.cs +++ b/src/NSExt/Extensions/StreamExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class StreamExtensions { @@ -19,8 +19,4 @@ public static class StreamExtensions 0xff }) < 0; } -} - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/StringExtensions.cs b/src/NSExt/Extensions/StringExtensions.cs index 6a54ac0..2d6de9f 100644 --- a/src/NSExt/Extensions/StringExtensions.cs +++ b/src/NSExt/Extensions/StringExtensions.cs @@ -1,4 +1,4 @@ -// ReSharper disable UnusedMember.Global +// ReSharper disable UnusedMember.Global using System.Security.Cryptography; @@ -569,8 +569,4 @@ public static class StringExtensions { return Uri.UnescapeDataString(me); } -} - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/TypeExtensions.cs b/src/NSExt/Extensions/TypeExtensions.cs index 19d64d1..a8739d0 100644 --- a/src/NSExt/Extensions/TypeExtensions.cs +++ b/src/NSExt/Extensions/TypeExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class TypeExtensions { @@ -16,8 +16,4 @@ public static class TypeExtensions .SelectMany(interfaceType => interfaceType.GetCustomAttributes(attributeType, true))) .Cast(); } -} - - - - +} \ No newline at end of file diff --git a/src/NSExt/Extensions/UriExtensions.cs b/src/NSExt/Extensions/UriExtensions.cs index ef50231..8b8bb43 100644 --- a/src/NSExt/Extensions/UriExtensions.cs +++ b/src/NSExt/Extensions/UriExtensions.cs @@ -1,4 +1,4 @@ -namespace NSExt.Extensions; +namespace NSExt.Extensions; public static class UriExtensions { @@ -11,13 +11,4 @@ public static class UriExtensions { return "//" + me.Authority + me.PathAndQuery; } -} - - - - - - - - - +} \ No newline at end of file diff --git a/src/NSExt/GlobalUsings.cs b/src/NSExt/GlobalUsings.cs index acbc150..a5091a5 100644 --- a/src/NSExt/GlobalUsings.cs +++ b/src/NSExt/GlobalUsings.cs @@ -1,4 +1,4 @@ -global using System.Data; +global using System.Data; global using System.Data.Common; global using System.Runtime.CompilerServices; global using Microsoft.Extensions.Logging; @@ -6,4 +6,4 @@ global using System.Globalization; global using System.Text; global using System.Text.RegularExpressions; global using System.Web; -global using System.ComponentModel; +global using System.ComponentModel; \ No newline at end of file diff --git a/src/README.md b/src/README.md index 8b13789..e69de29 100644 --- a/src/README.md +++ b/src/README.md @@ -1 +0,0 @@ -