From 36420eaa23fd7f7a6a3e03a72042f2efadbd44e0 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 27 Sep 2019 11:31:36 -0700
Subject: [PATCH] Avoid a newline after type parameter attributes

Fixes #38916
---
 .../Test/MetadataAsSource/MetadataAsSourceTests.cs   | 12 ++++--------
 .../Formatting/Rules/ElasticTriviaFormattingRule.cs  |  3 ++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
index 485d267b9c2..6a02d862c82 100644
--- a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
+++ b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
@@ -553,8 +553,7 @@ internal class MyAttribute : System.Attribute { }
 // {CodeAnalysisResources.InMemoryAssembly}
 #endregion
 
-public class [|C|]<[MyAttribute]
-T>
+public class [|C|]<[MyAttribute] T>
 {{
     public C();
 
@@ -593,8 +592,7 @@ internal class AllowNullAttribute : System.Attribute { }
 using System.Runtime.CompilerServices;
 
 [NullableContextAttribute(1)]
-public interface [|C|]<[NullableAttribute(2)]
-T>
+public interface [|C|]<[NullableAttribute(2)] T>
 {{
     bool Equals([AllowNullAttribute] T other);
 }}");
@@ -2273,8 +2271,7 @@ void M()
 
 using System.Runtime.CompilerServices;
 
-public class [|TestType|]<[NullableAttribute(1)]
-T> where T : notnull
+public class [|TestType|]<[NullableAttribute(1)] T> where T : notnull
 {{
     public TestType();
 }}";
@@ -2355,8 +2352,7 @@ void M([|D|]&lt;int&gt; lambda)
 
 using System.Runtime.CompilerServices;
 
-public delegate void [|D|]<[NullableAttribute(1)]
-T>() where T : notnull;";
+public delegate void [|D|]<[NullableAttribute(1)] T>() where T : notnull;";
 
             using var context = TestContext.Create(
                 LanguageNames.CSharp,
diff --git a/src/Workspaces/CSharp/Portable/Formatting/Rules/ElasticTriviaFormattingRule.cs b/src/Workspaces/CSharp/Portable/Formatting/Rules/ElasticTriviaFormattingRule.cs
index 4f83c7aab5a..33fd26b5003 100644
--- a/src/Workspaces/CSharp/Portable/Formatting/Rules/ElasticTriviaFormattingRule.cs
+++ b/src/Workspaces/CSharp/Portable/Formatting/Rules/ElasticTriviaFormattingRule.cs
@@ -290,7 +290,8 @@ private int LineBreaksAfter(SyntaxToken previousToken, SyntaxToken currentToken)
                             }
                         }
 
-                        if (previousToken.GetAncestor<ParameterSyntax>() == null)
+                        if (previousToken.GetAncestor<ParameterSyntax>() == null
+                            && previousToken.GetAncestor<TypeParameterSyntax>() == null)
                         {
                             return 1;
                         }
-- 
GitLab