Merge pull request #16 from dotnet/add-rule-order-class

Add Rule Order Class

Author: ellismg

src/Microsoft.DotNet.CodeFormatting.Tests/Rules/NonAsciiCharactersAreEscapedInLiteralsRuleTests.cs

@@ -48,6 +48,21 @@ class Test
             Verify(text, expected);
         }
 
+        [Fact]
+        public void NonAsciiRewriterHandlesNonStringLiterals()
+        {
+            var text = @"
+using System;
+
+class Test
+{
+    public const int OkayInt = 12345;
+}
+";
+
+            Verify(text, text);
+        }
+
         internal override IFormattingRule GetFormattingRule()
         {
             return new Rules.NonAsciiChractersAreEscapedInLiterals();

src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj

@@ -101,6 +101,7 @@
     <Compile Include="Rules\IsSimplifiedFormattingRule.cs" />
     <Compile Include="Rules\NonAsciiCharactersAreEscapedInLiteralsRule.cs" />
     <Compile Include="Rules\RuleExtensions.cs" />
+    <Compile Include="Rules\RuleOrder.cs" />
     <Compile Include="Rules\UsesXunitForTestsFormattingRule.cs" />
     <Compile Include="RuleTypeConstants.cs" />
   </ItemGroup>

src/Microsoft.DotNet.CodeFormatting/Properties/AssemblyInfo.cs

@@ -5,36 +5,17 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
+[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation.  All rights reserved.")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+
 [assembly: AssemblyTitle("Microsoft.DotNet.CodeFormatting")]
+[assembly: AssemblyProduct("Microsoft.DotNet.CodeFormatting")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.DotNet.CodeFormatting")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("Microsoft.DotNet.CodeFormatting.Tests")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c950a4bd-7014-4d1f-a1e0-9945016cf07f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: InternalsVisibleTo("Microsoft.DotNet.CodeFormatting.Tests")]

src/Microsoft.DotNet.CodeFormatting/Rules/ExplicitVisibilityRule.cs

@@ -14,7 +14,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(9)]
+    [RuleOrder(RuleOrder.ExplicitVisibilityRule)]
     internal sealed class ExplicitVisibilityRule : IFormattingRule
     {
         private sealed class VisibilityRewriter : CSharpSyntaxRewriter

src/Microsoft.DotNet.CodeFormatting/Rules/HasCopyrightHeaderFormattingRule.cs

@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(3)]
+    [RuleOrder(RuleOrder.HasCopyrightHeaderFormattingRule)]
     internal sealed class HasCopyrightHeaderFormattingRule : IFormattingRule
     {
         private static readonly string[] s_copyrightHeader =

src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstNamespaceFormattingRule.cs

@@ -14,7 +14,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(6)]
+    [RuleOrder(RuleOrder.HasNewLineBeforeFirstNamespaceFormattingRule)]
     internal sealed class HasNewLineBeforeFirstNamespaceFormattingRule : IFormattingRule
     {
         public async Task<Document> ProcessAsync(Document document, CancellationToken cancellationToken)

src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstUsingFormattingRule.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(5)]
+    [RuleOrder(RuleOrder.HasNewLineBeforeFirstUsingFormattingRule)]
     internal sealed class HasNewLineBeforeFirstUsingFormattingRule : IFormattingRule
     {
         private const string FormatError = "Could not format using";

src/Microsoft.DotNet.CodeFormatting/Rules/HasNoCustomCopyrightHeaderFormattingRule.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(1)]
+    [RuleOrder(RuleOrder.HasNoCustomCopyrightHeaderFormattingRule)]
     internal sealed class HasNoCustomCopyrightHeaderFormattingRule : IFormattingRule
     {
         private static string RulerMarker { get; set; }

src/Microsoft.DotNet.CodeFormatting/Rules/HasNoIllegalHeadersFormattingRule.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(2)]
+    [RuleOrder(RuleOrder.HasNoIllegalHeadersFormattingRule)]
     internal sealed class HasNoIllegalHeadersFormattingRule : IFormattingRule
     {
         // We are going to replace this header with the actual filename of the document being processed

src/Microsoft.DotNet.CodeFormatting/Rules/HasNoNewLineAfterOpenBraceFormattingRule.cs

@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.CodeFormatting.Rules
 {
-    [RuleOrder(8)]
+    [RuleOrder(RuleOrder.HasNoNewLineAfterOpenBraceFormattingRule)]
     internal sealed class HasNoNewLineAfterOpenBraceFormattingRule : IFormattingRule
     {
         public async Task<Document> ProcessAsync(Document document, CancellationToken cancellationToken)