Fixing style issues in Mvc.Core

src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgeryTokenSerializer.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
+using System.Text;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Security.DataProtection;
-using System.Text;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Mvc
                     }
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 // swallow all exceptions - homogenize error if something went wrong
                 innerException = ex;

src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgeryWorker.cs

@@ -156,10 +156,10 @@ namespace Microsoft.AspNet.Mvc
 
             Contract.Assert(_validator.IsCookieTokenValid(oldCookieToken));
 
-            AntiForgeryToken formToken = _generator.
+            AntiForgeryToken formToken = _generator.GenerateFormToken(
-                                            GenerateFormToken(httpContext,
+                httpContext,
-                                                    ExtractIdentity(httpContext),
+                ExtractIdentity(httpContext),
-                                                    oldCookieToken);
+                oldCookieToken);
 
             return new AntiForgeryTokenSetInternal()
                             {

src/Microsoft.AspNet.Mvc.Core/AntiForgery/BinaryBlob.cs

@@ -6,9 +6,9 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Microsoft.AspNet.Security.DataProtection;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/AntiForgery/TokenProvider.cs

@@ -3,10 +3,9 @@
 
 using System;
 using System.Diagnostics.Contracts;
-using System.Security.Principal;
+using System.Security.Claims;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Core;
-using System.Security.Claims;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -72,8 +71,7 @@ namespace Microsoft.AspNet.Mvc
             {
                 // Application says user is authenticated, but we have no identifier for the user.
                 throw new InvalidOperationException(
-                                        Resources.
+                    Resources.FormatTokenValidator_AuthenticatedUserWithoutUsername(identity.GetType()));
-                                            FormatTokenValidator_AuthenticatedUserWithoutUsername(identity.GetType()));
             }
 
             return formToken;
@@ -132,9 +130,8 @@ namespace Microsoft.AspNet.Mvc
                                                  StringComparison.Ordinal : 
                                                  StringComparison.OrdinalIgnoreCase))
             {
-                throw new InvalidOperationException(Resources.
+                throw new InvalidOperationException(
-                                                        FormatAntiForgeryToken_UsernameMismatch(fieldToken.Username,
+                    Resources.FormatAntiForgeryToken_UsernameMismatch(fieldToken.Username, currentUsername));
-                                                                                               currentUsername));
             }
 
             if (!Equals(fieldToken.ClaimUid, currentClaimUid))

src/Microsoft.AspNet.Mvc.Core/Areas/ReflectedRouteConstraintsActionDescriptorProvider.cs

@@ -22,11 +22,11 @@ namespace Microsoft.AspNet.Mvc
             // Iterate all the Reflected Action Descriptor providers and add area or other route constraints
             foreach (var actionDescriptor in context.Results.OfType<ReflectedActionDescriptor>())
             {
-                var routeConstraints = actionDescriptor.
+                var routeConstraints = actionDescriptor
-                                       ControllerDescriptor.
+                    .ControllerDescriptor
-                                       ControllerTypeInfo.
+                    .ControllerTypeInfo
-                                       GetCustomAttributes<RouteConstraintAttribute>().
+                    .GetCustomAttributes<RouteConstraintAttribute>()
-                                       ToArray();
+                    .ToArray();
 
                 foreach (var routeConstraint in routeConstraints)
                 {

src/Microsoft.AspNet.Mvc.Core/BodyParameterInfo.cs

@@ -14,5 +14,4 @@ namespace Microsoft.AspNet.Mvc
 
         public Type ParameterType { get; private set; }
     }
-}
+}
-

src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs

@@ -314,7 +314,6 @@ namespace Microsoft.AspNet.Mvc
         // Ex: These are not in the same equivalence class.
         //  Action 1: constraint keys - { action, controller, area }
         //  Action 2: constraint keys - { action, module }
-        //
         private ActionDescriptor FindEquivalenceClass(ActionDescriptor[] candidates)
         {
             Contract.Assert(candidates.Length > 1);

src/Microsoft.AspNet.Mvc.Core/DefaultControllerDescriptorFactory.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 
 namespace Microsoft.AspNet.Mvc
 {
-    public class DefaultControllerDescriptorFactory  : IControllerDescriptorFactory
+    public class DefaultControllerDescriptorFactory : IControllerDescriptorFactory
     {
         public ControllerDescriptor CreateControllerDescriptor(TypeInfo typeInfo)
         {

src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeAttribute.cs

@@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Mvc
 
         public AuthorizeAttribute(string claimType, string claimValue)
         {
-            _claims = new [] { new Claim(claimType, claimValue) };
+            _claims = new[] { new Claim(claimType, claimValue) };
         }
 
         public AuthorizeAttribute(string claimType, string claimValue, params string[] otherClaimValues)
@@ -53,9 +53,9 @@ namespace Microsoft.AspNet.Mvc
                     user.Identity == null || 
                     !user.Identity.IsAuthenticated;
 
-                    if(userIsAnonymous && !HasAllowAnonymous(context))
+                    if (userIsAnonymous && !HasAllowAnonymous(context))
                     {
-                        base.Fail(context);
+                        Fail(context);
                     }
             }
             else 
@@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Mvc
 
                 if (!authorized)
                 {
-                    base.Fail(context);
+                    Fail(context);
                 }
             }
         }

src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs

@@ -84,7 +84,6 @@ namespace Microsoft.AspNet.Mvc.Filters
             var orderedControllerFilter = controllerFilter as IOrderedFilter;
             if (orderedControllerFilter != null)
             {
-
                 order = orderedControllerFilter.Order;
             }
 

src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs

@@ -9,7 +9,10 @@ namespace Microsoft.AspNet.Mvc
     {
         private static readonly FilterDescriptorOrderComparer _comparer = new FilterDescriptorOrderComparer();
 
-        public static FilterDescriptorOrderComparer Comparer { get { return _comparer; } }
+        public static FilterDescriptorOrderComparer Comparer
+        {
+            get { return _comparer; }
+        }
 
         public int Compare([NotNull]FilterDescriptor x, [NotNull]FilterDescriptor y)
         {

src/Microsoft.AspNet.Mvc.Core/Filters/FilterItemOrderComparer.cs

@@ -9,7 +9,10 @@ namespace Microsoft.AspNet.Mvc
     {
         private static readonly FilterItemOrderComparer _comparer = new FilterItemOrderComparer();
 
-        public static FilterItemOrderComparer Comparer { get { return _comparer; } }
+        public static FilterItemOrderComparer Comparer
+        {
+            get { return _comparer; }
+        }
 
         public int Compare([NotNull] FilterItem x, [NotNull] FilterItem y)
         {

src/Microsoft.AspNet.Mvc.Core/Internal/TypeHelper.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Contracts;
 using System.Reflection;
 using System.Threading.Tasks;
 
@@ -36,9 +35,10 @@ namespace Microsoft.AspNet.Mvc
         /// If the object is already an <see cref="IDictionary{string, object}"/> instance, then a copy
         /// is returned.
         /// </summary>
-        //
+        /// <remarks>
-        // The implementation of PropertyHelper will cache the property accessors per-type. This is
+        /// The implementation of PropertyHelper will cache the property accessors per-type. This is
-        // faster when the the same type is used multiple times with ObjectToDictionary.
+        /// faster when the the same type is used multiple times with ObjectToDictionary.
+        /// </remarks>
         public static IDictionary<string, object> ObjectToDictionary(object value)
         {
             var dictionary = value as IDictionary<string, object>;

src/Microsoft.AspNet.Mvc.Core/Internal/UTF8EncodingWithoutBOM.cs

@@ -1,4 +1,7 @@
-using System.Text;
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Text;
 
 namespace Microsoft.AspNet.Mvc.Internal
 {

src/Microsoft.AspNet.Mvc.Core/ParameterBinding/DefaultActionBindingContextProvider.cs

@@ -40,8 +40,7 @@ namespace Microsoft.AspNet.Mvc
                 new CompositeModelBinder(_modelBinders),
                 new CompositeValueProvider(valueProviders),
                 _inputFormatterProvider,
-                _validatorProviders
+                _validatorProviders);
-            );
 
             return Task.FromResult(context);
         }

src/Microsoft.AspNet.Mvc.Core/ReflectedActionExecutor.cs

@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Core;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Core;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -128,11 +127,10 @@ namespace Microsoft.AspNet.Mvc
                 if (innerTaskType != null && typeof(Task).IsAssignableFrom(innerTaskType))
                 {
                     throw new InvalidOperationException(
-                                    Resources.FormatActionExecutor_WrappedTaskInstance(
+                        Resources.FormatActionExecutor_WrappedTaskInstance(
-                                                                        methodName,
+                            methodName,
-                                                                        declaringType,
+                            declaringType,
-                                                                        actualTypeReturned.FullName
+                            actualTypeReturned.FullName));
-                                                                        ));
                 }
             }
         }

src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs

@@ -281,7 +281,6 @@ namespace Microsoft.AspNet.Mvc
 
                     var inputFormatter = actionBindingContext.InputFormatterProvider.GetInputFormatter(providerContext);
 
-
                     var formatterContext = new InputFormatterContext(actionBindingContext.ActionContext.HttpContext,
                                                                      modelMetadata,
                                                                      modelState);
@@ -519,7 +518,7 @@ namespace Microsoft.AspNet.Mvc
             ActionMethod,
             ResultFilters,
             ActionResult
-        };
+        }
 
         /// <summary>
         /// A one-way cursor for filters. 
@@ -543,44 +542,44 @@ namespace Microsoft.AspNet.Mvc
         /// </remarks>
         private struct FilterCursor
         {
-            private FilterStage Stage;
+            private FilterStage _stage;
-            private int Index;
+            private int _index;
-            private readonly IFilter[] Filters;
+            private readonly IFilter[] _filters;
 
             public FilterCursor(FilterStage stage, int index, IFilter[] filters)
             {
-                Stage = stage;
+                _stage = stage;
-                Index = index;
+                _index = index;
-                Filters = filters;
+                _filters = filters;
             }
 
             public FilterCursor(IFilter[] filters)
             {
-                Stage = FilterStage.Undefined;
+                _stage = FilterStage.Undefined;
-                Index = 0;
+                _index = 0;
-                Filters = filters;
+                _filters = filters;
             }
 
             public void SetStage(FilterStage stage)
             {
-                Stage = stage;
+                _stage = stage;
-                Index = 0;
+                _index = 0;
             }
 
             public FilterCursorItem<TFilter, TFilterAsync> GetNextFilter<TFilter, TFilterAsync>()
                 where TFilter : class
                 where TFilterAsync : class
             {
-                while (Index < Filters.Length)
+                while (_index < _filters.Length)
                 {
-                    var filter = Filters[Index] as TFilter;
+                    var filter = _filters[_index] as TFilter;
-                    var filterAsync = Filters[Index] as TFilterAsync;
+                    var filterAsync = _filters[_index] as TFilterAsync;
 
-                    Index += 1;
+                    _index += 1;
 
                     if (filter != null || filterAsync != null)
                     {
-                        return new FilterCursorItem<TFilter, TFilterAsync>(Stage, Index, filter, filterAsync);
+                        return new FilterCursorItem<TFilter, TFilterAsync>(_stage, _index, filter, filterAsync);
                     }
                 }
 
@@ -589,7 +588,7 @@ namespace Microsoft.AspNet.Mvc
 
             public bool StillAt<TFilter, TFilterAsync>(FilterCursorItem<TFilter, TFilterAsync> current)
             {
-                return current.Stage == Stage && current.Index == Index;
+                return current.Stage == _stage && current.Index == _index;
             }
         }
 

src/Microsoft.AspNet.Mvc.Core/Rendering/Expressions/ExpressionMetadataProvider.cs

@@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Mvc.Rendering.Expressions
                                                          [NotNull] ViewDataDictionary viewData,
                                                          IModelMetadataProvider metadataProvider)
         {
-            if(string.IsNullOrEmpty(expression))
+            if (string.IsNullOrEmpty(expression))
             {
                 return viewData.ModelMetadata;
             }

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs

@@ -1291,7 +1291,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
             var modelErrors = tryGetModelStateResult ? modelState.Errors : null;
 
             ModelError modelError = null;
-            if(modelErrors != null && modelErrors.Count != 0)
+            if (modelErrors != null && modelErrors.Count != 0)
             {
                 modelError = modelErrors.FirstOrDefault(m => !string.IsNullOrEmpty(m.ErrorMessage)) ?? modelErrors[0];
             }

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelperOfT.cs

@@ -98,12 +98,11 @@ namespace Microsoft.AspNet.Mvc.Rendering
         public HtmlString DisplayNameForInnerType<TInnerModel, TValue>(
             [NotNull] Expression<Func<TInnerModel, TValue>> expression)
         {
-            var metadata = ExpressionMetadataProvider.
+            var metadata = ExpressionMetadataProvider.FromLambdaExpression<TInnerModel, TValue>(
-                                            FromLambdaExpression<TInnerModel, TValue>(
+                expression,
-                                                                                expression,
+                new ViewDataDictionary<TInnerModel>(MetadataProvider),
-                                                                                new ViewDataDictionary<TInnerModel>(
+                MetadataProvider);
-                                                                                                    MetadataProvider),
+
-                                                                                MetadataProvider);
             var expressionText = ExpressionHelper.GetExpressionText(expression);
             if (metadata == null)
             {

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs

@@ -125,7 +125,8 @@ namespace Microsoft.AspNet.Mvc.Rendering
         private IEnumerable<string> GetViewNames()
         {
             var metadata = _viewData.ModelMetadata;
-            var templateHints = new string[] {
+            var templateHints = new string[]
+            {
                 _templateName, 
                 metadata.TemplateHint, 
                 metadata.DataTypeName

src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperDisplayNameExtensions.cs

@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
         /// <returns>
         /// The display name for the model.
         /// </returns>
-        public static HtmlString DisplayNameFor<TInnerModel,TValue>(
+        public static HtmlString DisplayNameFor<TInnerModel, TValue>(
             [NotNull] this IHtmlHelper<IEnumerable<TInnerModel>> htmlHelper,
             [NotNull] Expression<Func<TInnerModel, TValue>> expression)
         {

src/Microsoft.AspNet.Mvc.Core/Rendering/HtmlHelperInputExtensions.cs

@@ -197,7 +197,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
         public static HtmlString TextArea([NotNull] this IHtmlHelper htmlHelper,
             string name, object htmlAttributes)
         {
-            return htmlHelper.TextArea(name, value: null, rows: 0, columns:0, htmlAttributes: htmlAttributes);
+            return htmlHelper.TextArea(name, value: null, rows: 0, columns: 0, htmlAttributes: htmlAttributes);
         }
 
         public static HtmlString TextArea([NotNull] this IHtmlHelper htmlHelper,

src/Microsoft.AspNet.Mvc.Core/Rendering/UnobtrusiveValidationAttributesGenerator.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {

src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentInvoker.cs

@@ -66,7 +66,6 @@ namespace Microsoft.AspNet.Mvc
                 result = await InvokeAsyncCore(asyncMethod, context.ViewContext);
             }
 
-
             await result.ExecuteAsync(context);
         }
 

src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs

@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc
             var components = 
                 types
                 .Where(ViewComponentConventions.IsComponent)
-                .Select(c => new {Name = ViewComponentConventions.GetComponentName(c), Type = c.AsType()});
+                .Select(c => new { Name = ViewComponentConventions.GetComponentName(c), Type = c.AsType() });
 
             var matching = 
                 components

test/Microsoft.AspNet.Mvc.Core.Test/TestController.cs

@@ -22,7 +22,6 @@ namespace Microsoft.AspNet.Mvc.Core.Test
         #pragma warning disable 1998
         public async Task<int> TaskValueTypeAction(int i, string s)
         {
-            Console.WriteLine(s);
             return i;
         }
         #pragma warning restore 1998
@@ -59,13 +58,11 @@ namespace Microsoft.AspNet.Mvc.Core.Test
 
         public TaskDerivedType TaskActionWithCustomTaskReturnType(int i, string s)
         {
-            Console.WriteLine(s);
             return new TaskDerivedType();
         }
 
         public TaskOfTDerivedType<int> TaskActionWithCustomTaskOfTReturnType(int i, string s)
         {
-            Console.WriteLine(s);
             return new TaskOfTDerivedType<int>(1);
         }