fixed most stylistic errors and made sure UTF8Json folder stylistic deviations are not flagged as editors in the editor

Author: Mpdreamz

.editorconfig

@@ -1,115 +1,85 @@
-root=true
-
-[*.cs]
-trim_trailing_whitespace=true
-insert_final_newline=true
-
-[*]
-indent_style = tab
-indent_size = 4
-
-[*.cshtml]
-indent_style = tab
-indent_size = 4
-
-[*.{fs,fsx,yml}]
-indent_style = space
-indent_size = 4
-
-[*.{md,markdown,json,js,csproj,fsproj,targets,targets,props}]
-indent_style = space
-indent_size = 2
-
 # Dotnet code style settings:
 [*.{cs,vb}]
 
-# ---
-# naming conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-naming-conventions
-# currently not supported in Rider/Resharper so not using these for now
-# ---
-
-# ---
-# langugage conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#language-conventions
-
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = true
 
 # Prefer this.X except for _fields
 # TODO can we force _ for private fields?
 # TODO elevate severity after code cleanup to warning minimum
 # TODO use language latest
-dotnet_style_qualification_for_field = false:error
-dotnet_style_qualification_for_property = false:error
-dotnet_style_qualification_for_method = false:error
-dotnet_style_qualification_for_event = false:error
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
 
 # Use language keywords instead of framework type names for type references
-dotnet_style_predefined_type_for_locals_parameters_members = true:error
-dotnet_style_predefined_type_for_member_access = true:error
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
 
 # Suggest more modern language features when available
-dotnet_style_object_initializer = true:error
-dotnet_style_collection_initializer = true:error
-dotnet_style_explicit_tuple_names = true:error
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:error
-dotnet_style_prefer_inferred_tuple_names = true:error
-dotnet_style_coalesce_expression = true:error
-dotnet_style_null_propagation = true:error
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
 
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
-dotnet_style_readonly_field = true:error
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+dotnet_style_readonly_field = true:suggestion
 
 # CSharp code style settings:
 [*.cs]
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:error
-csharp_style_var_when_type_is_apparent = true:error
-csharp_style_var_elsewhere = true:error
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
 
-csharp_style_expression_bodied_methods = true:error
-csharp_style_expression_bodied_constructors = true:error
-csharp_style_expression_bodied_operators = true:error
-csharp_style_expression_bodied_properties = true:error
-csharp_style_expression_bodied_indexers = true:error
-csharp_style_expression_bodied_accessors = true:error
+csharp_style_expression_bodied_methods = true:suggestion
+csharp_style_expression_bodied_constructors = true:suggestion
+csharp_style_expression_bodied_operators = true:suggestion
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
 
 # Suggest more modern language features when available
-csharp_style_pattern_matching_over_is_with_cast_check = true:error
-csharp_style_pattern_matching_over_as_with_null_check = true:error
-csharp_style_inlined_variable_declaration = true:error
-csharp_style_deconstructed_variable_declaration = true:error
-csharp_style_pattern_local_over_anonymous_function = true:error
-csharp_style_throw_expression = true:error
-csharp_style_conditional_delegate_call = true:error
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
 
-csharp_prefer_braces = false:warning
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:error
+csharp_prefer_braces = false:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
 
 # ---
 # formatting conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions
 
 # Newline settings (Allman yo!)
-csharp_new_line_before_open_brace = all:error
-csharp_new_line_before_else = true:error
-csharp_new_line_before_catch = true:error
-csharp_new_line_before_finally = true:error
+csharp_new_line_before_open_brace = all:suggestion
+csharp_new_line_before_else = true:suggestion
+csharp_new_line_before_catch = true:suggestion
+csharp_new_line_before_finally = true:suggestion
 csharp_new_line_before_members_in_object_initializers = true
 # just a suggestion do to our JSON tests that use anonymous types to 
 # represent json quite a bit (makes copy paste easier).
 csharp_new_line_before_members_in_anonymous_types = true:suggestion
-csharp_new_line_between_query_expression_clauses = true:error
+csharp_new_line_between_query_expression_clauses = true:suggestion
 
 # Indent
-csharp_indent_case_contents = true:error
-csharp_indent_switch_labels = true:error
-csharp_space_after_cast = false:error
-csharp_space_after_keywords_in_control_flow_statements = true:error
-csharp_space_between_method_declaration_parameter_list_parentheses = false:error
-csharp_space_between_method_call_parameter_list_parentheses = false:error
+csharp_indent_case_contents = true:suggestion
+csharp_indent_switch_labels = true:suggestion
+csharp_space_after_cast = false:suggestion
+csharp_space_after_keywords_in_control_flow_statements = true:suggestion
+csharp_space_between_method_declaration_parameter_list_parentheses = false:suggestion
+csharp_space_between_method_call_parameter_list_parentheses = false:suggestion
 
 #Wrap
-csharp_preserve_single_line_statements = false:error
-csharp_preserve_single_line_blocks = true:error
+csharp_preserve_single_line_statements = false:suggestion
+csharp_preserve_single_line_blocks = true:suggestion
 
 # Resharper
 resharper_csharp_braces_for_lock=required_for_complex
@@ -123,7 +93,7 @@ resharper_csharp_braces_for_ifelse=required_for_complex
 resharper_csharp_accessor_owner_body=expression_body
 
 # Override source included files
-[{SimpleJson|SynchronizedCollection}.cs]
+[SynchronizedCollection.cs]
 csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = false:none
 csharp_style_var_elsewhere = false:none

src/Elasticsearch.Net/Extensions/Extensions.cs

@@ -22,7 +22,7 @@ internal static string Utf8String(this MemoryStream ms)
 			if (ms is null)
 				return null;
 
-			if (!ms.TryGetBuffer(out ArraySegment<byte> buffer) || buffer.Array is null)
+			if (!ms.TryGetBuffer(out var buffer) || buffer.Array is null)
 				return Encoding.UTF8.GetString(ms.ToArray());
 
 			return Encoding.UTF8.GetString(buffer.Array, buffer.Offset, buffer.Count);

src/Elasticsearch.Net/Transport/Pipeline/NameValueCollectionExtensions.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+
+namespace Elasticsearch.Net 
+{
+	internal static class NameValueCollectionExtensions
+	{
+		internal static string ToQueryString(this NameValueCollection nv)
+		{
+			if (nv == null || nv.AllKeys.Length == 0) return string.Empty;
+
+			// initialize with capacity for number of key/values with length 5 each
+			var builder = new StringBuilder("?", nv.AllKeys.Length * 2 * 5);
+			for (var i = 0; i < nv.AllKeys.Length; i++)
+			{
+				if (i != 0)
+					builder.Append("&");
+
+				var key = nv.AllKeys[i];
+				builder.Append(Uri.EscapeDataString(key));
+				builder.Append("=");
+				builder.Append(Uri.EscapeDataString(nv[key]));
+			}
+
+			return builder.ToString();
+		}
+
+		internal static void UpdateFromDictionary(this NameValueCollection queryString, Dictionary<string, object> queryStringUpdates,
+			ElasticsearchUrlFormatter provider
+		)
+		{
+			if (queryString == null || queryString.Count < 0) return;
+			if (queryStringUpdates == null || queryStringUpdates.Count < 0) return;
+
+			foreach (var kv in queryStringUpdates.Where(kv => !Extensions.IsNullOrEmpty(kv.Key)))
+			{
+				if (kv.Value == null)
+				{
+					queryString.Remove(kv.Key);
+					continue;
+				}
+				var resolved = provider.CreateString(kv.Value);
+				if (!resolved.IsNullOrEmpty())
+					queryString[kv.Key] = resolved;
+				else
+					queryString.Remove(kv.Key);
+			}
+		}
+	}
+}

src/Elasticsearch.Net/Transport/Pipeline/RequestData.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 
 namespace Elasticsearch.Net
 {
@@ -142,49 +141,4 @@ private string CreatePathWithQueryStrings(string path, IConnectionConfigurationV
 			return path;
 		}
 	}
-
-	internal static class NameValueCollectionExtensions
-	{
-		internal static string ToQueryString(this NameValueCollection nv)
-		{
-			if (nv == null || nv.AllKeys.Length == 0) return string.Empty;
-
-			// initialize with capacity for number of key/values with length 5 each
-			var builder = new StringBuilder("?", nv.AllKeys.Length * 2 * 5);
-			for (int i = 0; i < nv.AllKeys.Length; i++)
-			{
-				if (i != 0)
-					builder.Append("&");
-
-				var key = nv.AllKeys[i];
-				builder.Append(Uri.EscapeDataString(key));
-				builder.Append("=");
-				builder.Append(Uri.EscapeDataString(nv[key]));
-			}
-
-			return builder.ToString();
-		}
-
-		internal static void UpdateFromDictionary(this NameValueCollection queryString, Dictionary<string, object> queryStringUpdates,
-			ElasticsearchUrlFormatter provider
-		)
-		{
-			if (queryString == null || queryString.Count < 0) return;
-			if (queryStringUpdates == null || queryStringUpdates.Count < 0) return;
-
-			foreach (var kv in queryStringUpdates.Where(kv => !kv.Key.IsNullOrEmpty()))
-			{
-				if (kv.Value == null)
-				{
-					queryString.Remove(kv.Key);
-					continue;
-				}
-				var resolved = provider.CreateString(kv.Value);
-				if (!resolved.IsNullOrEmpty())
-					queryString[kv.Key] = resolved;
-				else
-					queryString.Remove(kv.Key);
-			}
-		}
-	}
 }

src/Nest/CommonAbstractions/Infer/Fields/FieldsFormatter.cs

@@ -36,7 +36,7 @@ public void Serialize(ref JsonWriter writer, Fields value, IJsonFormatterResolve
 
 			var fields = value.ListOfFields;
 			writer.WriteBeginArray();
-			for (int i = 0; i < fields.Count; i++)
+			for (var i = 0; i < fields.Count; i++)
 			{
 				if (i > 0)
 					writer.WriteValueSeparator();

src/Nest/CommonAbstractions/LazyDocument/LazyDocumentFormatter.cs

@@ -78,7 +78,7 @@ internal static void WriteUnindented(ref JsonReader reader, ref JsonWriter write
                     break;
                 case JsonToken.Number:
 					var segment = reader.ReadNumberSegment();
-					for (int i = 0; i < segment.Count; i++)
+					for (var i = 0; i < segment.Count; i++)
 						writer.WriteRawUnsafe(segment.Array[i + segment.Offset]);
 					break;
                 case JsonToken.String:

src/Tests/Tests/ClientConcepts/HighLevel/Caching/FieldResolverCacheTests.cs

@@ -477,7 +477,7 @@ public class CachePerformance
 			private FieldResolver _resolver;
 			private Stopwatch _stopwatch;
 
-			public CachePerformance(ITestOutputHelper output) => this._output = output;
+			public CachePerformance(ITestOutputHelper output) => _output = output;
 
 			[U]
 			public void CachedVsNonCached()

src/Tests/Tests/Document/Multiple/MultiGet/MultiGetApiTests.cs

@@ -168,7 +168,7 @@ protected override void ExpectResponse(MultiGetResponse response)
 				hit.Id.Should().NotBeNullOrWhiteSpace();
 				hit.Found.Should().BeTrue();
 				hit.Version.Should().Be(1);
-				if (base.Cluster.ClusterConfiguration.Version >= "6.8.0")
+				if (Cluster.ClusterConfiguration.Version >= "6.8.0")
 				{
 				    hit.PrimaryTerm.Should().BeGreaterOrEqualTo(1);
 				    hit.SequenceNumber.Should().BeGreaterOrEqualTo(0);

src/Tests/Tests/Document/Single/DocumentCrudTests.cs

@@ -78,7 +78,7 @@ [I] protected async Task DocumentIsUpdated() => await AssertOnGetAfterUpdate(r =
 		{
 			r.Source.Should().NotBeNull();
 			r.Version.Should().BeGreaterThan(1);
-			if (base.Cluster.ClusterConfiguration.Version >= "6.8.0")
+			if (Cluster.ClusterConfiguration.Version >= "6.8.0")
 			{
 				r.SequenceNumber.Should().BeGreaterOrEqualTo(1);
 				r.PrimaryTerm.Should().BeGreaterThan(0);

src/Tests/Tests/Document/Single/Get/GetApiTests.cs

@@ -47,7 +47,7 @@ protected override void ExpectResponse(GetResponse<Project> response)
 			response.SequenceNumber.Should().HaveValue();
 			response.PrimaryTerm.Should().HaveValue();
 			response.Source.ShouldAdhereToSourceSerializerWhenSet();
-			if (base.Cluster.ClusterConfiguration.Version >= "6.8.0")
+			if (Cluster.ClusterConfiguration.Version >= "6.8.0")
 			{
 				response.SequenceNumber.Should().BeGreaterOrEqualTo(0);
 				response.PrimaryTerm.Should().BeGreaterOrEqualTo(1);