Merge remote-tracking branch 'upstream/master' into bug-fixes

Conflicts:
	src/CodeFormatter/Program.cs
	src/Microsoft.DotNet.CodeFormatting/IFormattingEngine.cs

Author: jaredpar

src/CodeFormatter/Program.cs

@@ -19,7 +19,7 @@ private static int Main(string[] args)
         {
             if (args.Length < 1)
             {
-                Console.WriteLine("CodeFormatter <project or solution> [<rule types>] [/file <filename>]");
+                Console.WriteLine("CodeFormatter <project or solution> [<rule types>] [/file <filename>] [/nocopyright]");
                 Console.WriteLine("    <rule types> - Rule types to use in addition to the default ones.");
                 Console.WriteLine("                   Use ConvertTests to convert MSTest tests to xUnit.");
                 Console.WriteLine("    <filename> - Only apply changes to files with specified name.");
@@ -81,7 +81,6 @@ private static async Task RunAsync(string projectOrSolutionPath, IEnumerable<str
         {
             var workspace = MSBuildWorkspace.Create();
             var engine = FormattingEngine.Create(ruleTypes, filenames);
-            engine.Verbose = true;
             engine.PreprocessorConfigurations = preprocessorConfigurations;
 
             if (disableCopright)

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

@@ -36,21 +36,22 @@ public void DoNotAllowUnicodeInLiterals()
 class Test
 {{
     public static readonly string BadString = ""This has {0} and {1}, which are both bad."";
-    public static readonly string AnotherBadString = @""This has {0} and {1}, which are both bad."";
+    public static readonly string AnotherBadString = @""This has {0} and {1}, which are both bad, but we don't rewrite yet."";
     public const char BadChar = '{0}';
 }}
 ", '\u2713', "\U0001F308");
 
-            var expected = @"
+            var expected = string.Format(@"
 using System;
 
 class Test
-{
+{{
     public static readonly string BadString = ""This has \u2713 and \U0001F308, which are both bad."";
-    public static readonly string AnotherBadString = @""This has \u2713 and \U0001F308, which are both bad."";
+    public static readonly string AnotherBadString = @""This has {0} and {1}, which are both bad, but we don't rewrite yet."";
     public const char BadChar = '\u2713';
-}
-";
+}}
+", '\u2713', "\U0001F308");
+
             Verify(text, expected);
         }
 

src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs

@@ -29,7 +29,6 @@ internal sealed class FormattingEngineImplementation : IFormattingEngine
         private readonly IEnumerable<ILocalSemanticFormattingRule> _localSemanticRules;
         private readonly IEnumerable<IGlobalSemanticFormattingRule> _globalSemanticRules;
         private readonly Stopwatch _watch = new Stopwatch();
-        private bool _verbose;
 
         public ImmutableArray<string> CopyrightHeader
         {
@@ -49,12 +48,6 @@ public IFormatLogger FormatLogger
             set { _options.FormatLogger = value; }
         }
 
-        public bool Verbose
-        {
-            get { return _verbose; }
-            set { _verbose = value; }
-        }
-
         [ImportingConstructor]
         internal FormattingEngineImplementation(
             Options options,
@@ -159,15 +152,7 @@ private void StartDocument()
         private void EndDocument(Document document)
         {
             _watch.Stop();
-            if (_verbose && _watch.Elapsed.TotalSeconds > 1)
-            {
-                FormatLogger.WriteLine();
-                FormatLogger.WriteLine("    {0} {1} seconds", document.Name, _watch.Elapsed.TotalSeconds);
-            }
-            else
-            {
-                FormatLogger.Write(".");
-            }
+            FormatLogger.WriteLine("    {0} {1} seconds", document.Name, _watch.Elapsed.TotalSeconds);
         }
 
         /// <summary>
@@ -200,7 +185,6 @@ private async Task<Solution> RunSyntaxPass(Solution originalSolution, IReadOnlyL
                 }
             }
 
-            FormatLogger.WriteLine();
             return currentSolution;
         }
 
@@ -222,7 +206,6 @@ private async Task<Solution> RunLocalSemanticPass(Solution solution, IReadOnlyLi
                 solution = await RunLocalSemanticPass(solution, documentIds, localSemanticRule, cancellationToken);
             }
 
-            FormatLogger.WriteLine();
             return solution;
         }
 
@@ -249,7 +232,6 @@ private async Task<Solution> RunLocalSemanticPass(Solution originalSolution, IRe
                 }
             }
 
-            FormatLogger.WriteLine();
             return currentSolution;
         }
 
@@ -261,7 +243,6 @@ private async Task<Solution> RunGlobalSemanticPass(Solution solution, IReadOnlyL
                 solution = await RunGlobalSemanticPass(solution, documentIds, globalSemanticRule, cancellationToken);
             }
 
-            FormatLogger.WriteLine();
             return solution;
         }
 
@@ -282,7 +263,6 @@ private async Task<Solution> RunGlobalSemanticPass(Solution solution, IReadOnlyL
                 EndDocument(document);
             }
 
-            FormatLogger.WriteLine();
             return solution;
         }
     }

src/Microsoft.DotNet.CodeFormatting/IFormatLogger.cs

@@ -31,8 +31,10 @@ public void WriteLine(string format, params object[] args)
 
         public void WriteErrorLine(string format, params object[] args)
         {
+            Console.ForegroundColor = ConsoleColor.Red;
             Console.Write("Error: ");
             Console.WriteLine(format, args);
+            Console.ResetColor();
         }
 
         public void WriteLine()

src/Microsoft.DotNet.CodeFormatting/IFormattingEngine.cs

@@ -14,9 +14,7 @@ public interface IFormattingEngine
     {
         ImmutableArray<string> CopyrightHeader { get; set; }
         ImmutableArray<string[]> PreprocessorConfigurations { get; set; }
-        bool Verbose { get; set; }
-        
         Task FormatSolutionAsync(Solution solution, CancellationToken cancellationToken);
         Task FormatProjectAsync(Project porject, CancellationToken cancellationToken);
     }
-}
+}

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

@@ -51,6 +51,13 @@ private static SyntaxNode RewriteStringLiteralExpression(LiteralExpressionSyntax
             {
                 Debug.Assert(node.CSharpKind() == SyntaxKind.StringLiteralExpression);
 
+                if (node.Token.IsVerbatimStringLiteral())
+                {
+                    // We do not correctly rewrite verbatim string literals yet.  Once Issue 39 is
+                    // fixed we can remove this early out.
+                    return node;
+                }
+
                 if (HasNonAsciiCharacters(node.Token.Text))
                 {
                     string convertedText = EscapeNonAsciiCharacters(node.Token.Text);