Fixed multiline copyright comments.

Author: peteri

StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1634UnitTests.cs

@@ -14,6 +14,8 @@ namespace StyleCop.Analyzers.Test.DocumentationRules
     /// </summary>
     public class SA1634UnitTests : FileHeaderTestBase
     {
+        private string multiLineSettings;
+
         /// <summary>
         /// Verifies that a file header without a copyright element will produce the expected diagnostic (none for the default case)
         /// </summary>
@@ -94,10 +96,46 @@ namespace Bar
             var expectedDiagnostic = this.CSharpDiagnostic(FileHeaderAnalyzers.SA1634Descriptor).WithLocation(1, 1);
             await this.VerifyCSharpDiagnosticAsync(testCode, expectedDiagnostic, CancellationToken.None).ConfigureAwait(false);
         }
+        /// <summary>
+        /// Verifies that a file header with a copyright element will not produce a diagnostic message.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestValidMultiLineFileHeaderWithCopyrightLastAsync()
+        {
+            var testCode = @"// <author>
+//   John Doe
+// </author>
+// <copyright file=""Test0.cs"" company=""FooCorp"">
+// Copyright (c) FooCorp. All rights reserved.
+// Licence is FooBar MIT.
+// </copyright>
+
+namespace Bar
+{
+}
+";
+            this.multiLineSettings = @"
+{
+  ""settings"": {
+    ""documentationRules"": {
+      ""companyName"": ""FooCorp"",
+      ""copyrightText"": ""Copyright (c) FooCorp. All rights reserved.\nLicence is FooBar MIT.""
+    }
+  }
+}
+";
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
 
         protected override CodeFixProvider GetCSharpCodeFixProvider()
         {
             throw new System.NotImplementedException();
         }
+
+        protected override string GetSettings()
+        {
+            return this.multiLineSettings ?? base.GetSettings();
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/FileHeaderAnalyzers.cs

@@ -315,13 +315,15 @@ private static void CheckCopyrightText(SyntaxTreeAnalysisContext context, Compil
                 return;
             }
 
-            if (string.Equals(settings.DocumentationRules.CopyrightText, DocumentationSettings.DefaultCopyrightText, StringComparison.OrdinalIgnoreCase))
+            var settingsCopyrightText = settings.DocumentationRules.CopyrightText;
+            if (string.Equals(settingsCopyrightText, DocumentationSettings.DefaultCopyrightText, StringComparison.OrdinalIgnoreCase))
             {
                 // The copyright text is meaningless until the company name is configured by the user.
                 return;
             }
 
-            if (string.CompareOrdinal(copyrightText.Trim(' ', '\r', '\n'), settings.DocumentationRules.CopyrightText) != 0)
+            // Remove any leading or trailing spaces and remove the extra space put in as a seperator.
+            if (string.CompareOrdinal(copyrightText.Trim(' ', '\r', '\n').Replace("\n ","\n"), settingsCopyrightText.Trim(' ', '\r', '\n')) != 0)
             {
                 var location = fileHeader.GetElementLocation(context.Tree, copyrightElement);
                 context.ReportDiagnostic(Diagnostic.Create(SA1636Descriptor, location));