From 8954071220cf0a19a1d75e9fe48b0b72bd01b05b Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Sat, 21 Nov 2020 12:01:08 +0100 Subject: [PATCH] Allow multiline ifs if their body is not multiline itself for content (#2591) * Allow multiline ifs if their body is not multiline itself * sln.DotSettings * Tabs bad --- .editorconfig | 3 +++ SpaceStation14.sln.DotSettings | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index ef68433a3c..4bebc53999 100644 --- a/.editorconfig +++ b/.editorconfig @@ -332,5 +332,8 @@ dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = * dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter +# ReSharper properties +resharper_braces_for_ifelse = required_for_multiline + [*.{csproj,xml,yml,dll.config,msbuildproj,targets}] indent_size = 2 diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 27f3ba2fc7..5d7e8fdb10 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -27,7 +27,7 @@ Required Required Required - RequiredForMultilineStatement + RequiredForMultiline Required Required Required