From 3e7de6386c1dc7477ee994ccaa7c893fe94c066b Mon Sep 17 00:00:00 2001 From: Bruce Wayne Date: Wed, 8 Sep 2021 13:37:48 +0800 Subject: [PATCH] style: Same code style with VS --- .editorconfig | 7 +-- HttpProxy/HttpUtils.cs | 8 ++-- .../ReadOnlySequenceStream.cs | 6 +-- Shadowsocks.Crypto/ShadowsocksCrypto.cs | 44 +++++++++---------- .../ListenServices/UdpListenService.cs | 8 +++- .../LocalTcpServices/Socks5Service.cs | 2 +- .../LocalUdpServices/Socks5UdpService.cs | 2 +- 7 files changed, 42 insertions(+), 35 deletions(-) diff --git a/.editorconfig b/.editorconfig index e7d9c8e..2355f5b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -50,6 +50,9 @@ dotnet_style_qualification_for_method = false:suggestion dotnet_style_qualification_for_property = false:suggestion dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion +# 缩进首选项 +csharp_indent_case_contents_when_block = false + # ReSharper properties resharper_align_multiline_binary_expressions_chain = false resharper_autodetect_indent_settings = true @@ -59,7 +62,7 @@ resharper_braces_for_foreach = required resharper_braces_for_ifelse = required resharper_braces_for_while = required resharper_braces_redundant = false -resharper_csharp_alignment_tab_fill_style = optimal_fill +resharper_csharp_alignment_tab_fill_style = use_tabs_only resharper_csharp_blank_lines_around_invocable = 0 resharper_csharp_indent_style = tab resharper_csharp_insert_final_newline = true @@ -76,8 +79,6 @@ resharper_csharp_wrap_before_first_type_parameter_constraint = true resharper_csharp_wrap_before_invocation_rpar = true resharper_csharp_wrap_lines = false resharper_csharp_wrap_multiple_type_parameter_constraints_style = chop_always -resharper_int_align_switch_expressions = true -resharper_int_align_switch_sections = true resharper_keep_existing_declaration_block_arrangement = true resharper_keep_existing_declaration_parens_arrangement = false resharper_keep_existing_embedded_arrangement = false diff --git a/HttpProxy/HttpUtils.cs b/HttpProxy/HttpUtils.cs index 95544f1..6faeb8f 100644 --- a/HttpProxy/HttpUtils.cs +++ b/HttpProxy/HttpUtils.cs @@ -33,10 +33,10 @@ internal static string BuildErrorResponse(ConnectionErrorResult error, string ht return error switch { ConnectionErrorResult.AuthenticationError => $"{httpVersion} 401 Unauthorized\r\n\r\n", - ConnectionErrorResult.HostUnreachable => $"{httpVersion} 502 {error}\r\n\r\n", - ConnectionErrorResult.ConnectionRefused => $"{httpVersion} 502 {error}\r\n\r\n", - ConnectionErrorResult.ConnectionReset => $"{httpVersion} 502 {error}\r\n\r\n", - _ => $"{httpVersion} 500 Internal Server Error\r\nX-Proxy-Error-Type: {error}\r\n\r\n" + ConnectionErrorResult.HostUnreachable => $"{httpVersion} 502 {error}\r\n\r\n", + ConnectionErrorResult.ConnectionRefused => $"{httpVersion} 502 {error}\r\n\r\n", + ConnectionErrorResult.ConnectionReset => $"{httpVersion} 502 {error}\r\n\r\n", + _ => $"{httpVersion} 500 Internal Server Error\r\nX-Proxy-Error-Type: {error}\r\n\r\n" }; } diff --git a/Pipelines.Extensions/ReadOnlySequenceStream.cs b/Pipelines.Extensions/ReadOnlySequenceStream.cs index 952474b..1e8b002 100644 --- a/Pipelines.Extensions/ReadOnlySequenceStream.cs +++ b/Pipelines.Extensions/ReadOnlySequenceStream.cs @@ -84,10 +84,10 @@ public override long Seek(long offset, SeekOrigin origin) var pos = origin switch { - SeekOrigin.Begin => default, + SeekOrigin.Begin => default, SeekOrigin.Current => Position, - SeekOrigin.End => _readOnlySequence.Length, - _ => throw Requires.FailRange(nameof(origin)) + SeekOrigin.End => _readOnlySequence.Length, + _ => throw Requires.FailRange(nameof(origin)) }; _position = _readOnlySequence.GetPosition(offset + pos); diff --git a/Shadowsocks.Crypto/ShadowsocksCrypto.cs b/Shadowsocks.Crypto/ShadowsocksCrypto.cs index 0a4acdc..29811b8 100644 --- a/Shadowsocks.Crypto/ShadowsocksCrypto.cs +++ b/Shadowsocks.Crypto/ShadowsocksCrypto.cs @@ -39,29 +39,29 @@ public static IShadowsocksCrypto Create(string method, string password) { return method switch { - NoneMethod or PlainMethod => new NoneShadowsocksCrypto(password), - Rc4Method => new Rc4ShadowsocksCrypto(password), - Rc4Md5Method => new Rc4Md5ShadowsocksCrypto(password), - Rc4Md56Method => new Rc4Md56ShadowsocksCrypto(password), - Aes128CtrMethod => new Aes128CtrShadowsocksCrypto(password), - Aes192CtrMethod => new Aes192CtrShadowsocksCrypto(password), - Aes256CtrMethod => new Aes256CtrShadowsocksCrypto(password), - Aes128CfbMethod => new Aes128CfbShadowsocksCrypto(password), - Aes192CfbMethod => new Aes192CfbShadowsocksCrypto(password), - Aes256CfbMethod => new Aes256CfbShadowsocksCrypto(password), - ChaCha20IetfMethod => new ChaCha20IETFShadowsocksCrypto(password), - ChaCha20Method => new ChaCha20ShadowsocksCrypto(password), - Salsa20Method => new Salsa20ShadowsocksCrypto(password), - XSalsa20Method => new XSalsa20ShadowsocksCrypto(password), - XChaCha20Method => new XChaCha20ShadowsocksCrypto(password), - Sm4CtrMethod => new Sm4CtrShadowsocksCrypto(password), - Aes128GcmMethod => new Aes128GcmShadowsocksCrypto(password), - Aes192GcmMethod => new Aes192GcmShadowsocksCrypto(password), - Aes256GcmMethod => new Aes256GcmShadowsocksCrypto(password), - ChaCha20IetfPoly1305Method => new ChaChaPoly1305ShadowsocksCrypto(password), + NoneMethod or PlainMethod => new NoneShadowsocksCrypto(password), + Rc4Method => new Rc4ShadowsocksCrypto(password), + Rc4Md5Method => new Rc4Md5ShadowsocksCrypto(password), + Rc4Md56Method => new Rc4Md56ShadowsocksCrypto(password), + Aes128CtrMethod => new Aes128CtrShadowsocksCrypto(password), + Aes192CtrMethod => new Aes192CtrShadowsocksCrypto(password), + Aes256CtrMethod => new Aes256CtrShadowsocksCrypto(password), + Aes128CfbMethod => new Aes128CfbShadowsocksCrypto(password), + Aes192CfbMethod => new Aes192CfbShadowsocksCrypto(password), + Aes256CfbMethod => new Aes256CfbShadowsocksCrypto(password), + ChaCha20IetfMethod => new ChaCha20IETFShadowsocksCrypto(password), + ChaCha20Method => new ChaCha20ShadowsocksCrypto(password), + Salsa20Method => new Salsa20ShadowsocksCrypto(password), + XSalsa20Method => new XSalsa20ShadowsocksCrypto(password), + XChaCha20Method => new XChaCha20ShadowsocksCrypto(password), + Sm4CtrMethod => new Sm4CtrShadowsocksCrypto(password), + Aes128GcmMethod => new Aes128GcmShadowsocksCrypto(password), + Aes192GcmMethod => new Aes192GcmShadowsocksCrypto(password), + Aes256GcmMethod => new Aes256GcmShadowsocksCrypto(password), + ChaCha20IetfPoly1305Method => new ChaChaPoly1305ShadowsocksCrypto(password), XChaCha20IetfPoly1305Method => new XChaChaPoly1305ShadowsocksCrypto(password), - Sm4GcmMethod => new Sm4GcmShadowsocksCrypto(password), - _ => throw new ArgumentException($@"Invalid method: {method}", nameof(method)) + Sm4GcmMethod => new Sm4GcmShadowsocksCrypto(password), + _ => throw new ArgumentException($@"Invalid method: {method}", nameof(method)) }; } } diff --git a/Shadowsocks.Protocol/ListenServices/UdpListenService.cs b/Shadowsocks.Protocol/ListenServices/UdpListenService.cs index 4f918f9..e60d314 100644 --- a/Shadowsocks.Protocol/ListenServices/UdpListenService.cs +++ b/Shadowsocks.Protocol/ListenServices/UdpListenService.cs @@ -45,7 +45,13 @@ public async ValueTask StartAsync() //TODO .NET6.0 var message = await UdpListener.ReceiveAsync(); #if DEBUG - _logger.LogDebug(@"{0}: {1} bytes {2} => {3}", LoggerHeader, message.Buffer.Length, message.RemoteEndPoint, UdpListener.Client.LocalEndPoint); + _logger.LogDebug( + @"{0}: {1} bytes {2} => {3}", + LoggerHeader, + message.Buffer.Length, + message.RemoteEndPoint, + UdpListener.Client.LocalEndPoint + ); #endif HandleAsync(message, _cts.Token).Forget(); } diff --git a/Shadowsocks.Protocol/LocalTcpServices/Socks5Service.cs b/Shadowsocks.Protocol/LocalTcpServices/Socks5Service.cs index bb9b100..e12e2e0 100644 --- a/Shadowsocks.Protocol/LocalTcpServices/Socks5Service.cs +++ b/Shadowsocks.Protocol/LocalTcpServices/Socks5Service.cs @@ -54,7 +54,7 @@ public async ValueTask HandleAsync(IDuplexPipe pipe, CancellationToken token = d var target = socks5.Target.Type switch { AddressType.Domain => socks5.Target.Domain!, - _ => socks5.Target.Address!.ToString() + _ => socks5.Target.Address!.ToString() }; await using var client = await _serversController.GetServerAsync(target); diff --git a/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs b/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs index 0b4737f..e4ece1c 100644 --- a/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs +++ b/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs @@ -69,7 +69,7 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc var target = socks5UdpPacket.Type switch { AddressType.Domain => socks5UdpPacket.Domain!, - _ => socks5UdpPacket.Address!.ToString() + _ => socks5UdpPacket.Address!.ToString() }; if (!_cache.TryGetValue(receiveResult.RemoteEndPoint, out IUdpClient client))