From 59b65d4161087dc5180d009facf3748ac0261b28 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 8 Feb 2020 16:42:06 -0800 Subject: [PATCH] Move more into SyntaxKinds --- .../Portable/LanguageServices/CSharpSyntaxFactsService.cs | 3 --- .../Portable/LanguageServices/CSharpSyntaxKindsService.cs | 2 ++ .../SyntaxFactsService/AbstractSyntaxFactsService.cs | 3 +++ .../SyntaxFactsService/ISyntaxKindsService.cs | 4 ++++ .../LanguageServices/VisualBasicSyntaxFactsService.vb | 6 +++--- .../LanguageServices/VisualBasicSyntaxKindsService.vb | 2 ++ 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs index d36e7c43cc8..a370599d209 100644 --- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs +++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs @@ -222,9 +222,6 @@ public bool IsStatement(SyntaxNode node) public bool IsExecutableStatement(SyntaxNode node) => node is StatementSyntax; - public bool IsParameter(SyntaxNode node) - => node is ParameterSyntax; - public bool IsVariableDeclarator(SyntaxNode node) => node is VariableDeclaratorSyntax; diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs index b5aca1734bd..91f16f60c41 100644 --- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs +++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs @@ -55,5 +55,7 @@ public override TSyntaxKind Convert(int kind) public override int LockStatement => (int)SyntaxKind.LockStatement; public override int ReturnStatement => (int)SyntaxKind.ReturnStatement; public override int UsingStatement => (int)SyntaxKind.UsingStatement; + + public override int Parameter => (int)SyntaxKind.Parameter; } } diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs index 6c1285e8d90..98d97351491 100644 --- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs +++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs @@ -639,6 +639,9 @@ public bool IsReturnStatement([NotNullWhen(true)] SyntaxNode node) public bool IsUsingStatement([NotNullWhen(true)] SyntaxNode node) => node?.RawKind == SyntaxKinds.UsingStatement; + public bool IsParameter([NotNullWhen(true)] SyntaxNode node) + => node?.RawKind == SyntaxKinds.Parameter; + #nullable restore } } diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs index 29ad7e3587d..dfee0fa63ea 100644 --- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs +++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs @@ -61,6 +61,8 @@ internal interface ISyntaxKindsService : ILanguageService int LockStatement { get; } int ReturnStatement { get; } int UsingStatement { get; } + + int Parameter { get; } } internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService @@ -103,5 +105,7 @@ internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService public abstract int LockStatement { get; } public abstract int ReturnStatement { get; } public abstract int UsingStatement { get; } + + public abstract int Parameter { get; } } } diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb index 15d99e440f7..ae3f598e4b1 100644 --- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb +++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb @@ -256,7 +256,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Return False End Function - Private Function ISyntaxFacts_IsLockStatement(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsLockStatement + Private Function ISyntaxFacts_IsLockStaisptement(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsLockStatement Return IsLockStatement(node) End Function @@ -276,8 +276,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Return TypeOf node Is ExecutableStatementSyntax End Function - Public Function IsParameter(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsParameter - Return TypeOf node Is ParameterSyntax + Private Function ISyntaxFacts_IsParameter(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsParameter + Return IsParameter(node) End Function Public Function IsVariableDeclarator(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsVariableDeclarator diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb index 2f6f1f5af9f..3074f2838da 100644 --- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb +++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb @@ -54,5 +54,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices Public Overrides ReadOnly Property LockStatement As Integer = SyntaxKind.SyncLockStatement Public Overrides ReadOnly Property ReturnStatement As Integer = SyntaxKind.ReturnStatement Public Overrides ReadOnly Property UsingStatement As Integer = SyntaxKind.UsingStatement + + Public Overrides ReadOnly Property Parameter As Integer = SyntaxKind.Parameter End Class End Namespace -- GitLab