Changed enable / disable switch implementation

The switches for enabling / disabling common rule implementations is now
changed over to use the rule disabling mechanism.

Author: jaredpar

src/CodeFormatter/Program.cs

@@ -69,10 +69,9 @@ Use ConvertTests to convert MSTest tests to xUnit.
 
             var fileNamesBuilder = ImmutableArray.CreateBuilder<string>();
             var configBuilder = ImmutableArray.CreateBuilder<string[]>();
-            var copyrightHeader = FormattingConstants.DefaultCopyrightHeader;
+            var copyrightHeader = FormattingDefaults.DefaultCopyrightHeader;
             var ruleMap = ImmutableDictionary<string, bool>.Empty;
             var language = LanguageNames.CSharp;
-            var convertUnicode = true;
             var allowTables = false;
             var verbose = false;
 
@@ -111,11 +110,11 @@ Use ConvertTests to convert MSTest tests to xUnit.
                 }
                 else if (comparer.Equals(arg, "/nocopyright"))
                 {
-                    copyrightHeader = ImmutableArray<string>.Empty;
+                    ruleMap = ruleMap.SetItem(FormattingDefaults.CopyrightRuleName, false);
                 }
                 else if (comparer.Equals(arg, "/nounicode"))
                 {
-                    convertUnicode = false;
+                    ruleMap = ruleMap.SetItem(FormattingDefaults.UnicodeLiteralsRuleName, false);
                 }
                 else if (comparer.Equals(arg, "/verbose"))
                 {
@@ -152,7 +151,6 @@ Use ConvertTests to convert MSTest tests to xUnit.
                     ruleMap,
                     language,
                     allowTables,
-                    convertUnicode,
                     verbose);
         }
 
@@ -183,7 +181,6 @@ private static int RunFormat(
             ImmutableDictionary<string, bool> ruleMap,
             string language,
             bool allowTables,
-            bool convertUnicode,
             bool verbose)
         {
             var cts = new CancellationTokenSource();
@@ -201,7 +198,6 @@ private static int RunFormat(
                     ruleMap,
                     language,
                     allowTables,
-                    convertUnicode,
                     verbose,
                     ct).Wait(ct);
                 Console.WriteLine("Completed formatting.");
@@ -230,7 +226,6 @@ private static async Task<int> RunFormatAsync(
             ImmutableDictionary<string, bool> ruleMap,
             string language,
             bool allowTables,
-            bool convertUnicode,
             bool verbose,
             CancellationToken cancellationToken)
         {
@@ -239,7 +234,6 @@ private static async Task<int> RunFormatAsync(
             engine.FileNames = fileNames;
             engine.CopyrightHeader = copyrightHeader;
             engine.AllowTables = allowTables;
-            engine.ConvertUnicodeCharacters = convertUnicode;
             engine.Verbose = verbose;
 
             if (!SetRuleMap(engine, ruleMap))

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

@@ -10,7 +10,7 @@ public class NonAsciiCharactersAreEscapedInLiteralsTests : SyntaxRuleTestBase
     {
         internal override ISyntaxFormattingRule Rule
         {
-            get { return new Rules.NonAsciiCharactersAreEscapedInLiterals(new Options() { ConvertUnicodeCharacters = true }); }
+            get { return new Rules.NonAsciiCharactersAreEscapedInLiterals(); }
         }
 
         [Fact]

src/Microsoft.DotNet.CodeFormatting/FormattingConstants.cs renamed to src/Microsoft.DotNet.CodeFormatting/FormattingDefaults.cs

@@ -10,8 +10,11 @@
 
 namespace Microsoft.DotNet.CodeFormatting
 {
-    public static class FormattingConstants
+    public static class FormattingDefaults
     {
+        public const string UnicodeLiteralsRuleName = "UnicodeLiterals";
+        public const string CopyrightRuleName = "Copyright";
+
         private static readonly string[] s_defaultCopyrightHeader =
         {
             "// Copyright (c) Microsoft. All rights reserved.",
@@ -20,7 +23,7 @@ public static class FormattingConstants
 
         public static readonly ImmutableArray<string> DefaultCopyrightHeader;
 
-        static FormattingConstants()
+        static FormattingDefaults()
         {
             DefaultCopyrightHeader = ImmutableArray.CreateRange(s_defaultCopyrightHeader);
         }

src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs

@@ -73,12 +73,6 @@ public bool Verbose
             set { _verbose = value; }
         }
 
-        public bool ConvertUnicodeCharacters
-        {
-            get { return _options.ConvertUnicodeCharacters; }
-            set { _options.ConvertUnicodeCharacters = value; }
-        }
-
         public ImmutableArray<IRuleMetadata> AllRules
         {
             get

src/Microsoft.DotNet.CodeFormatting/IFormattingEngine.cs

@@ -17,7 +17,6 @@ public interface IFormattingEngine
         ImmutableArray<string> FileNames { get; set; }
         ImmutableArray<IRuleMetadata> AllRules { get; }
         bool AllowTables { get; set; }
-        bool ConvertUnicodeCharacters { get; set; }
         bool Verbose { get; set; }
         void ToggleRuleEnabled(IRuleMetadata ruleMetaData, bool enabled);
         Task FormatSolutionAsync(Solution solution, CancellationToken cancellationToken);

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

@@ -92,7 +92,7 @@
     <Compile Include="SyntaxUtil.cs" />
     <Compile Include="Filters\FilenameFilter.cs" />
     <Compile Include="Filters\UsableFileFilter.cs" />
-    <Compile Include="FormattingConstants.cs" />
+    <Compile Include="FormattingDefaults.cs" />
     <Compile Include="FormattingEngine.cs" />
     <Compile Include="FormattingEngineImplementation.cs" />
     <Compile Include="IFormatLogger.cs" />

src/Microsoft.DotNet.CodeFormatting/Options.cs

@@ -27,16 +27,13 @@ internal sealed class Options
 
         internal IFormatLogger FormatLogger { get; set; }
 
-        internal bool ConvertUnicodeCharacters { get; set; }
-
         [ImportingConstructor]
         internal Options()
         {
-            CopyrightHeader = FormattingConstants.DefaultCopyrightHeader;
+            CopyrightHeader = FormattingDefaults.DefaultCopyrightHeader;
             FileNames = ImmutableArray<string>.Empty;
             PreprocessorConfigurations = ImmutableArray<string[]>.Empty;
             FormatLogger = new ConsoleFormatLogger();
-            ConvertUnicodeCharacters = true;
         }
     }
 }

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

@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.CodeFormatting.Rules
     [SyntaxRule(CopyrightHeaderRule.Name, CopyrightHeaderRule.Description, SyntaxRuleOrder.CopyrightHeaderRule)]
     internal sealed partial class CopyrightHeaderRule : SyntaxFormattingRule, ISyntaxFormattingRule
     {
-        internal const string Name = "Copyright";
+        internal const string Name = FormattingDefaults.CopyrightRuleName;
         internal const string Description = "Insert the copyright header into every file";
 
         private abstract class CommonRule

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

@@ -17,24 +17,11 @@ namespace Microsoft.DotNet.CodeFormatting.Rules
     [SyntaxRule(NonAsciiCharactersAreEscapedInLiterals.Name, NonAsciiCharactersAreEscapedInLiterals.Description, SyntaxRuleOrder.NonAsciiChractersAreEscapedInLiterals)]
     internal sealed class NonAsciiCharactersAreEscapedInLiterals : CSharpOnlyFormattingRule, ISyntaxFormattingRule
     {
-        internal const string Name = "UnicodeLiterals";
+        internal const string Name = FormattingDefaults.UnicodeLiteralsRuleName;
         internal const string Description = "Use unicode escape sequence instead of unicode literals";
 
-        private readonly Options _options;
-
-        [ImportingConstructor]
-        internal NonAsciiCharactersAreEscapedInLiterals(Options options)
-        {
-            _options = options;
-        }
-
         public SyntaxNode Process(SyntaxNode root, string languageName)
         {
-            if (!_options.ConvertUnicodeCharacters)
-            {
-                return root;
-            }
-
             return UnicodeCharacterEscapingSyntaxRewriter.Rewriter.Visit(root);
         }