Move more into SyntaxKinds

src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs

@@ -594,9 +594,6 @@ public bool IsSimpleArgument(SyntaxNode node)
                    argument.NameColon == null;
         }
 
-        public bool IsTypeArgumentList(SyntaxNode node)
-            => node.IsKind(SyntaxKind.TypeArgumentList);
-
         public bool IsTypeConstraint(SyntaxNode node)
             => node.IsKind(SyntaxKind.TypeConstraint);
 

src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs

@@ -60,5 +60,7 @@ public override TSyntaxKind Convert<TSyntaxKind>(int kind)
 
         public override int Parameter => (int)SyntaxKind.Parameter;
         public override int VariableDeclarator => (int)SyntaxKind.VariableDeclarator;
+
+        public override int TypeArgumentList => (int)SyntaxKind.TypeArgumentList;
     }
 }

src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs

@@ -651,6 +651,9 @@ public bool IsParameter([NotNullWhen(true)] SyntaxNode node)
         public bool IsVariableDeclarator([NotNullWhen(true)] SyntaxNode node)
             => node?.RawKind == SyntaxKinds.VariableDeclarator;
 
+        public bool IsTypeArgumentList([NotNullWhen(true)] SyntaxNode node)
+            => node?.RawKind == SyntaxKinds.TypeArgumentList;
+
 #nullable restore
     }
 }

src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs

@@ -66,6 +66,8 @@ internal interface ISyntaxKindsService : ILanguageService
 
         int Parameter { get; }
         int VariableDeclarator { get; }
+
+        int TypeArgumentList { get; }
     }
 
     internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService
@@ -113,5 +115,7 @@ internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService
 
         public abstract int Parameter { get; }
         public abstract int VariableDeclarator { get; }
+
+        public abstract int TypeArgumentList { get; }
     }
 }

src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb

@@ -642,8 +642,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
             Return argument IsNot Nothing AndAlso Not argument.IsNamed AndAlso Not argument.IsOmitted
         End Function
 
-        Public Function IsTypeArgumentList(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeArgumentList
-            Return node.IsKind(SyntaxKind.TypeArgumentList)
+        Private Function ISyntaxFacts_IsTypeArgumentList(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeArgumentList
+            Return IsTypeArgumentList(node)
         End Function
 
         Public Function IsTypeConstraint(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeConstraint
@@ -2076,7 +2076,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Private Function ISyntaxFactsService_IsExpressionStatement(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsExpressionStatement
-            Return MyBase.IsExpressionStatement(node)
+            Return IsExpressionStatement(node)
         End Function
 
         Public Function IsUsingAliasDirective(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsUsingAliasDirective

src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb

@@ -59,5 +59,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices
 
         Public Overrides ReadOnly Property Parameter As Integer = SyntaxKind.Parameter
         Public Overrides ReadOnly Property VariableDeclarator As Integer = SyntaxKind.VariableDeclarator
+
+        Public Overrides ReadOnly Property TypeArgumentList As Integer = SyntaxKind.TypeArgumentList
     End Class
 End Namespace