Clean up some MVC code (#31511)

pranavkm · web-flow · commit d32b018eab3e · 2021-04-03T18:57:49.000Z
* Clean up some MVC code

* PR feedback
diff --git a/src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegateProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegateProvider.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Microsoft.AspNetCore.Mvc.Controllers
@@ -55,6 +57,18 @@ internal static class ControllerBinderDelegateProvider
                 return null;
             }
 
+            var parameters = actionDescriptor.Parameters switch
+            {
+                List<ParameterDescriptor> list => list.ToArray(),
+                _ => actionDescriptor.Parameters.ToArray()
+            };
+
+            var properties = actionDescriptor.BoundProperties switch
+            {
+                List<ParameterDescriptor> list => list.ToArray(),
+                _ => actionDescriptor.BoundProperties.ToArray()
+            };
+
             return Bind;
 
             async Task Bind(ControllerContext controllerContext, object controller, Dictionary<string, object?> arguments)
@@ -67,9 +81,7 @@ async Task Bind(ControllerContext controllerContext, object controller, Dictiona
 
                 Debug.Assert(valueProvider is not null);
 
-                var parameters = actionDescriptor.Parameters;
-
-                for (var i = 0; i < parameters.Count; i++)
+                for (var i = 0; i < parameters.Length; i++)
                 {
                     var parameter = parameters[i];
                     var bindingInfo = parameterBindingInfo![i];
@@ -95,8 +107,7 @@ async Task Bind(ControllerContext controllerContext, object controller, Dictiona
                     }
                 }
 
-                var properties = actionDescriptor.BoundProperties;
-                for (var i = 0; i < properties.Count; i++)
+                for (var i = 0; i < properties.Length; i++)
                 {
                     var property = properties[i];
                     var bindingInfo = propertyBindingInfo![i];
diff --git a/src/Mvc/Mvc.Razor/src/TagHelpers/UrlResolutionTagHelper.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/UrlResolutionTagHelper.cs
@@ -343,15 +343,7 @@ private static string CreateTrimmedString(string input, int start)
 
         private static bool IsCharWhitespace(char ch)
         {
-            for (var i = 0; i < ValidAttributeWhitespaceChars.Length; i++)
-            {
-                if (ValidAttributeWhitespaceChars[i] == ch)
-                {
-                    return true;
-                }
-            }
-            // the character is not white space
-            return false;
+            return ValidAttributeWhitespaceChars.AsSpan().IndexOf(ch) != -1;
         }
 
         private class EncodeFirstSegmentContent : IHtmlContent
diff --git a/src/Mvc/Mvc.TagHelpers/src/AttributeMatcher.cs b/src/Mvc/Mvc.TagHelpers/src/AttributeMatcher.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Microsoft.AspNetCore.Mvc.TagHelpers
@@ -24,7 +23,7 @@ internal static class AttributeMatcher
         /// <returns><c>true</c> if a mode was determined, otherwise <c>false</c>.</returns>
         public static bool TryDetermineMode<TMode>(
             TagHelperContext context,
-            IReadOnlyList<ModeAttributes<TMode>> modeInfos,
+            ModeAttributes<TMode>[] modeInfos,
             Func<TMode, TMode, int> compare,
             out TMode result)
         {
@@ -47,16 +46,14 @@ public static bool TryDetermineMode<TMode>(
             result = default;
 
             // Perf: Avoid allocating enumerator
-            var modeInfosCount = modeInfos.Count;
             var allAttributes = context.AllAttributes;
             // Read interface .Count once rather than per iteration
             var allAttributesCount = allAttributes.Count;
-            for (var i = 0; i < modeInfosCount; i++)
+            foreach (var modeInfo in modeInfos)
             {
-                var modeInfo = modeInfos[i];
                 var requiredAttributes = modeInfo.Attributes;
                 // If there are fewer attributes present than required, one or more of them must be missing.
-                if (allAttributesCount >= requiredAttributes.Length && 
+                if (allAttributesCount >= requiredAttributes.Length &&
                     !HasMissingAttributes(allAttributes, requiredAttributes) &&
                     compare(result, modeInfo.Mode) <= 0)
                 {
diff --git a/src/Mvc/Mvc.ViewFeatures/src/DefaultDisplayTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultDisplayTemplates.cs
@@ -212,7 +212,7 @@ public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)
             var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
 
             var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);
-            foreach (var propertyExplorer in modelExplorer.Properties)
+            foreach (var propertyExplorer in modelExplorer.PropertiesInternal)
             {
                 var propertyMetadata = propertyExplorer.Metadata;
                 if (!ShouldShow(propertyExplorer, templateInfo))
diff --git a/src/Mvc/Mvc.ViewFeatures/src/DefaultEditorTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultEditorTemplates.cs
@@ -255,7 +255,7 @@ public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)
             var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
 
             var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);
-            foreach (var propertyExplorer in modelExplorer.Properties)
+            foreach (var propertyExplorer in modelExplorer.PropertiesInternal)
             {
                 var propertyMetadata = propertyExplorer.Metadata;
                 if (!ShouldShow(propertyExplorer, templateInfo))
@@ -476,18 +476,17 @@ public override void Write(char value)
 
             public override void Write(char[] buffer, int index, int count)
             {
-                if (count > 0)
-                {
-                    HasContent = true;
-                }
+                HasContent |= count > 0;
+            }
+
+            public override void Write(ReadOnlySpan<char> buffer)
+            {
+                HasContent |= buffer.IsEmpty;
             }
 
             public override void Write(string value)
             {
-                if (!string.IsNullOrEmpty(value))
-                {
-                    HasContent = true;
-                }
+                HasContent |= !string.IsNullOrEmpty(value);
             }
         }
 
@@ -540,7 +539,7 @@ public override void Encode(TextWriter output, string value, int startIndex, int
                     return;
                 }
 
-                output.Write(value.Substring(startIndex, characterCount));
+                output.Write(value.AsSpan(startIndex, characterCount));
             }
 
             public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ModelExplorer.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExplorer.cs
@@ -199,7 +199,7 @@ public Type ModelType
         /// </remarks>
         public IEnumerable<ModelExplorer> Properties => PropertiesInternal;
 
-        private ModelExplorer[] PropertiesInternal
+        internal ModelExplorer[] PropertiesInternal
         {
             get
             {
@@ -472,4 +472,4 @@ private ModelExplorer CreateExplorerForProperty(
             return new ModelExplorer(_metadataProvider, this, propertyMetadata, modelAccessor);
         }
     }
-}
+}
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ModelExplorerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExplorerExtensions.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 
 namespace Microsoft.AspNetCore.Mvc.ViewFeatures
 {
@@ -68,12 +67,13 @@ public static string GetSimpleDisplayText(this ModelExplorer modelExplorer)
                 return stringResult;
             }
 
-            var firstProperty = modelExplorer.Properties.FirstOrDefault();
-            if (firstProperty == null)
+            if (modelExplorer.PropertiesInternal.Length == 0)
             {
                 return string.Empty;
             }
 
+            var firstProperty = modelExplorer.PropertiesInternal[0];
+
             if (firstProperty.Model == null)
             {
                 return firstProperty.Metadata.NullDisplayText;
@@ -82,4 +82,4 @@ public static string GetSimpleDisplayText(this ModelExplorer modelExplorer)
             return Convert.ToString(firstProperty.Model, CultureInfo.CurrentCulture);
         }
     }
-}
+}
diff --git a/src/Mvc/MvcNoDeps.slnf b/src/Mvc/MvcNoDeps.slnf
@@ -67,7 +67,7 @@
       "src\\Mvc\\test\\WebSites\\SimpleWebSite\\SimpleWebSite.csproj",
       "src\\Mvc\\test\\WebSites\\TagHelpersWebSite\\TagHelpersWebSite.csproj",
       "src\\Mvc\\test\\WebSites\\VersioningWebSite\\VersioningWebSite.csproj",
-      "src\\Mvc\\test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj",
+      "src\\Mvc\\test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj"
     ]
   }
 }
diff --git a/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs b/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs
@@ -70,9 +70,7 @@ private static int ParseChunksCount(string? value)
         {
             if (value != null && value.StartsWith(ChunkCountPrefix, StringComparison.Ordinal))
             {
-                var chunksCountString = value.Substring(ChunkCountPrefix.Length);
-                int chunksCount;
-                if (int.TryParse(chunksCountString, NumberStyles.None, CultureInfo.InvariantCulture, out chunksCount))
+                if (int.TryParse(value.AsSpan(ChunkCountPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var chunksCount))
                 {
                     return chunksCount;
                 }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)`
`212`	`212`	`var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();`
`213`	`213`
`214`	`214`	`var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);`
`215`		`- foreach (var propertyExplorer in modelExplorer.Properties)`
	`215`	`+ foreach (var propertyExplorer in modelExplorer.PropertiesInternal)`
`216`	`216`	`{`
`217`	`217`	`var propertyMetadata = propertyExplorer.Metadata;`
`218`	`218`	`if (!ShouldShow(propertyExplorer, templateInfo))`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)`
`255`	`255`	`var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();`
`256`	`256`
`257`	`257`	`var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);`
`258`		`- foreach (var propertyExplorer in modelExplorer.Properties)`
	`258`	`+ foreach (var propertyExplorer in modelExplorer.PropertiesInternal)`
`259`	`259`	`{`
`260`	`260`	`var propertyMetadata = propertyExplorer.Metadata;`
`261`	`261`	`if (!ShouldShow(propertyExplorer, templateInfo))`
`@@ -476,18 +476,17 @@ public override void Write(char value)`
`476`	`476`
`477`	`477`	`public override void Write(char[] buffer, int index, int count)`
`478`	`478`	`{`
`479`		`- if (count > 0)`
`480`		`- {`
`481`		`- HasContent = true;`
`482`		`- }`
	`479`	`+ HasContent \|= count > 0;`
	`480`	`+ }`
	`481`	`+`
	`482`	`+ public override void Write(ReadOnlySpan<char> buffer)`
	`483`	`+ {`
	`484`	`+ HasContent \|= buffer.IsEmpty;`
`483`	`485`	`}`
`484`	`486`
`485`	`487`	`public override void Write(string value)`
`486`	`488`	`{`
`487`		`- if (!string.IsNullOrEmpty(value))`
`488`		`- {`
`489`		`- HasContent = true;`
`490`		`- }`
	`489`	`+ HasContent \|= !string.IsNullOrEmpty(value);`
`491`	`490`	`}`
`492`	`491`	`}`
`493`	`492`
`@@ -540,7 +539,7 @@ public override void Encode(TextWriter output, string value, int startIndex, int`
`540`	`539`	`return;`
`541`	`540`	`}`
`542`	`541`
`543`		`- output.Write(value.Substring(startIndex, characterCount));`
	`542`	`+ output.Write(value.AsSpan(startIndex, characterCount));`
`544`	`543`	`}`
`545`	`544`
`546`	`545`	`public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public Type ModelType`
`199`	`199`	`/// </remarks>`
`200`	`200`	`public IEnumerable<ModelExplorer> Properties => PropertiesInternal;`
`201`	`201`
`202`		`- private ModelExplorer[] PropertiesInternal`
	`202`	`+ internal ModelExplorer[] PropertiesInternal`
`203`	`203`	`{`
`204`	`204`	`get`
`205`	`205`	`{`
`@@ -472,4 +472,4 @@ private ModelExplorer CreateExplorerForProperty(`
`472`	`472`	`return new ModelExplorer(_metadataProvider, this, propertyMetadata, modelAccessor);`
`473`	`473`	`}`
`474`	`474`	`}`
`475`		`-}`
	`475`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Diagnostics;`
`6`	`6`	`using System.Globalization;`
`7`		`-using System.Linq;`
`8`	`7`
`9`	`8`	`namespace Microsoft.AspNetCore.Mvc.ViewFeatures`
`10`	`9`	`{`
`@@ -68,12 +67,13 @@ public static string GetSimpleDisplayText(this ModelExplorer modelExplorer)`
`68`	`67`	`return stringResult;`
`69`	`68`	`}`
`70`	`69`
`71`		`- var firstProperty = modelExplorer.Properties.FirstOrDefault();`
`72`		`- if (firstProperty == null)`
	`70`	`+ if (modelExplorer.PropertiesInternal.Length == 0)`
`73`	`71`	`{`
`74`	`72`	`return string.Empty;`
`75`	`73`	`}`
`76`	`74`
	`75`	`+ var firstProperty = modelExplorer.PropertiesInternal[0];`
	`76`	`+`
`77`	`77`	`if (firstProperty.Model == null)`
`78`	`78`	`{`
`79`	`79`	`return firstProperty.Metadata.NullDisplayText;`
`@@ -82,4 +82,4 @@ public static string GetSimpleDisplayText(this ModelExplorer modelExplorer)`
`82`	`82`	`return Convert.ToString(firstProperty.Model, CultureInfo.CurrentCulture);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`-}`
	`85`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`"src\\Mvc\\test\\WebSites\\SimpleWebSite\\SimpleWebSite.csproj",`
`68`	`68`	`"src\\Mvc\\test\\WebSites\\TagHelpersWebSite\\TagHelpersWebSite.csproj",`
`69`	`69`	`"src\\Mvc\\test\\WebSites\\VersioningWebSite\\VersioningWebSite.csproj",`
`70`		`- "src\\Mvc\\test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj",`
	`70`	`+ "src\\Mvc\\test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj"`
`71`	`71`	`]`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,7 @@ private static int ParseChunksCount(string? value)`
`70`	`70`	`{`
`71`	`71`	`if (value != null && value.StartsWith(ChunkCountPrefix, StringComparison.Ordinal))`
`72`	`72`	`{`
`73`		`- var chunksCountString = value.Substring(ChunkCountPrefix.Length);`
`74`		`- int chunksCount;`
`75`		`- if (int.TryParse(chunksCountString, NumberStyles.None, CultureInfo.InvariantCulture, out chunksCount))`
	`73`	`+ if (int.TryParse(value.AsSpan(ChunkCountPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var chunksCount))`
`76`	`74`	`{`
`77`	`75`	`return chunksCount;`
`78`	`76`	`}`