Classify function pointer punctuation (dotnet#47668)

* Classify function pointers correctly * Use a stable sort for classifications
ryzngard · Sep 15, 2020 · a2feb62 · a2feb62
1 parent 9737cff
commit a2feb62
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 16 deletions.
diff --git a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
@@ -1511,8 +1511,8 @@ await TestAsync(code,
                 testHost,
                 ParseOptions(Options.Regular),
                 Class("C"),
-                Static("M"),
-                Method("M"));
+                Method("M"),
+                Static("M"));
         }
 
         [Theory]
@@ -1811,8 +1811,8 @@ enum MyEnum
                 Namespace("MyNameSpace"),
                 Namespace("rabbit"),
                 Class("MyClass2"),
-                Static("method"),
                 Method("method"),
+                Static("method"),
                 Namespace("rabbit"),
                 Class("MyClass2"),
                 Event("myEvent"),
@@ -1822,12 +1822,12 @@ enum MyEnum
                 Struct("MyStruct"),
                 Namespace("rabbit"),
                 Class("MyClass2"),
-                Static("MyProp"),
                 Property("MyProp"),
+                Static("MyProp"),
                 Namespace("rabbit"),
                 Class("MyClass2"),
-                Static("myField"),
                 Field("myField"),
+                Static("myField"),
                 Namespace("rabbit"),
                 Class("MyClass2"),
                 Delegate("MyDelegate"),
@@ -4054,8 +4054,8 @@ void N()
 }",
             testHost,
             Keyword("var"),
-            Static("Parse"),
-            Method("Parse"));
+            Method("Parse"),
+            Static("Parse"));
         }
 
         [Theory]
@@ -4087,8 +4087,8 @@ void N()
 }",
             testHost,
             Keyword("_"),
-            Static("Parse"),
-            Method("Parse"));
+            Method("Parse"),
+            Static("Parse"));
         }
 
         [Theory]

diff --git a/src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs
@@ -2618,6 +2618,8 @@ abstract class Goo : Bar
         decimal goo4;
 
         delegate void D();
+        delegate* managed<int, int> mgdfun;
+        delegate* unmanaged<int, int> unmgdfun;
 
         double goo5;
 
@@ -2833,6 +2835,26 @@ interface Bar
                 Punctuation.OpenParen,
                 Punctuation.CloseParen,
                 Punctuation.Semicolon,
+                Keyword("delegate"),
+                Operators.Asterisk,
+                Keyword("managed"),
+                Punctuation.OpenAngle,
+                Keyword("int"),
+                Punctuation.Comma,
+                Keyword("int"),
+                Punctuation.CloseAngle,
+                Field("mgdfun"),
+                Punctuation.Semicolon,
+                Keyword("delegate"),
+                Operators.Asterisk,
+                Keyword("unmanaged"),
+                Punctuation.OpenAngle,
+                Keyword("int"),
+                Punctuation.Comma,
+                Keyword("int"),
+                Punctuation.CloseAngle,
+                Field("unmgdfun"),
+                Punctuation.Semicolon,
                 Keyword("double"),
                 Field("goo5"),
                 Punctuation.Semicolon,
@@ -5464,5 +5486,39 @@ void M<T>() where T : notnull { }
                 Punctuation.CloseCurly,
                 Punctuation.CloseCurly);
         }
+
+        [Theory]
+        [CombinatorialData]
+        [WorkItem(45807, "https://github.com/dotnet/roslyn/issues/45807")]
+        public async Task FunctionPointer(TestHost testHost)
+        {
+            var code = @"
+class C
+{
+    delegate* unmanaged[Stdcall, SuppressGCTransition] <int, int> x;
+}";
+
+            await TestAsync(code,
+                testHost,
+                Keyword("class"),
+                Class("C"),
+                Punctuation.OpenCurly,
+                Keyword("delegate"),
+                Operators.Asterisk,
+                Keyword("unmanaged"),
+                Punctuation.OpenBracket,
+                Identifier("Stdcall"),
+                Punctuation.Comma,
+                Identifier("SuppressGCTransition"),
+                Punctuation.CloseBracket,
+                Punctuation.OpenAngle,
+                Keyword("int"),
+                Punctuation.Comma,
+                Keyword("int"),
+                Punctuation.CloseAngle,
+                Field("x"),
+                Punctuation.Semicolon,
+                Punctuation.CloseCurly);
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/Classification/TotalClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/TotalClassifierTests.cs
@@ -938,8 +938,8 @@ void Test()
                 ParseOptions(Options.Regular),
                 Keyword("static"),
                 Keyword("class"),
-                Static("ExtMethod"),
                 Class("ExtMethod"),
+                Static("ExtMethod"),
                 Punctuation.OpenCurly,
                 Keyword("public"),
                 Keyword("static"),
@@ -962,8 +962,8 @@ void Test()
                 Punctuation.OpenParen,
                 Punctuation.CloseParen,
                 Punctuation.OpenCurly,
-                Static("ExtMethod"),
                 Class("ExtMethod"),
+                Static("ExtMethod"),
                 Operators.Dot,
                 Method("TestMethod"),
                 Static("TestMethod"),

diff --git a/src/EditorFeatures/TestUtilities/Classification/AbstractClassifierTests.cs b/src/EditorFeatures/TestUtilities/Classification/AbstractClassifierTests.cs
@@ -46,9 +46,9 @@ protected async Task TestAsync(
             var span = new TextSpan(start, length);
             var actual = await GetClassificationSpansAsync(allCode, span, parseOptions, testHost);
 
-            actual = actual.Sort((t1, t2) => t1.TextSpan.Start - t2.TextSpan.Start);
+            var actualOrdered = actual.OrderBy((t1, t2) => t1.TextSpan.Start - t2.TextSpan.Start);
 
-            var actualFormatted = actual.Select(a => new FormattedClassification(allCode.Substring(a.TextSpan.Start, a.TextSpan.Length), a.ClassificationType));
+            var actualFormatted = actualOrdered.Select(a => new FormattedClassification(allCode.Substring(a.TextSpan.Start, a.TextSpan.Length), a.ClassificationType));
             AssertEx.Equal(expected, actualFormatted);
         }
 

diff --git a/src/Workspaces/CSharp/Portable/Classification/ClassificationHelpers.cs b/src/Workspaces/CSharp/Portable/Classification/ClassificationHelpers.cs
@@ -362,12 +362,13 @@ private static string GetClassificationForPunctuation(SyntaxToken token)
                 {
                     case SyntaxKind.LessThanToken:
                     case SyntaxKind.GreaterThanToken:
-                        // the < and > tokens of a type parameter list should be classified as
-                        // punctuation; otherwise, they're operators.
+                        // the < and > tokens of a type parameter list or function pointer parameter
+                        // list should be classified as punctuation; otherwise, they're operators.
                         if (token.Parent != null)
                         {
                             if (token.Parent.Kind() == SyntaxKind.TypeParameterList ||
-                                token.Parent.Kind() == SyntaxKind.TypeArgumentList)
+                                token.Parent.Kind() == SyntaxKind.TypeArgumentList ||
+                                token.Parent.Kind() == SyntaxKind.FunctionPointerParameterList)
                             {
                                 return ClassificationTypeNames.Punctuation;
                             }