From fd6070d712584a5f1c006aa63e6851b6121a8095 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 8 Feb 2020 16:38:12 -0800 Subject: [PATCH] Move more into SyntaxKinds --- .../Portable/LanguageServices/CSharpSyntaxFactsService.cs | 3 --- .../Portable/LanguageServices/CSharpSyntaxKindsService.cs | 1 + .../SyntaxFactsService/AbstractSyntaxFactsService.cs | 3 +++ .../SyntaxFactsService/ISyntaxKindsService.cs | 3 +++ .../LanguageServices/VisualBasicSyntaxFactsService.vb | 4 ++-- .../LanguageServices/VisualBasicSyntaxKindsService.vb | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs index 0a7cbe66fbc..347790440dd 100644 --- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs +++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs @@ -180,9 +180,6 @@ public SyntaxNode GetDefaultOfParameter(SyntaxNode node) public SyntaxNode GetParameterList(SyntaxNode node) => CSharpSyntaxGenerator.GetParameterList(node); - public bool IsSkippedTokensTrivia(SyntaxNode node) - => node is SkippedTokensTriviaSyntax; - public SyntaxToken GetIdentifierOfGenericName(SyntaxNode genericName) { return genericName is GenericNameSyntax csharpGenericName diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs index 259476d31b3..93c770afd35 100644 --- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs +++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs @@ -23,6 +23,7 @@ public override TSyntaxKind Convert(int kind) public override int ConflictMarkerTrivia => (int)SyntaxKind.ConflictMarkerTrivia; public override int DisabledTextTrivia => (int)SyntaxKind.DisabledTextTrivia; public override int EndOfLineTrivia => (int)SyntaxKind.EndOfLineTrivia; + public override int SkippedTokensTrivia => (int)SyntaxKind.SkippedTokensTrivia; public override int DotToken => (int)SyntaxKind.DotToken; public override int QuestionToken => (int)SyntaxKind.QuestionToken; diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs index 664bea2d961..b645311d50a 100644 --- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs +++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs @@ -606,6 +606,9 @@ public bool HasIncompleteParentMember(SyntaxNode node) #nullable enable + public bool IsSkippedTokensTrivia([NotNullWhen(true)] SyntaxNode? node) + => node?.RawKind == SyntaxKinds.SkippedTokensTrivia; + public bool IsGenericName([NotNullWhen(true)] SyntaxNode? node) => node?.RawKind == SyntaxKinds.GenericName; diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs index ca76a17c922..e6efbee499d 100644 --- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs +++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs @@ -4,6 +4,7 @@ #nullable enable +using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.Host; namespace Microsoft.CodeAnalysis.LanguageServices @@ -19,6 +20,7 @@ internal interface ISyntaxKindsService : ILanguageService int ConflictMarkerTrivia { get; } int DisabledTextTrivia { get; } int EndOfLineTrivia { get; } + int SkippedTokensTrivia { get; } int DotToken { get; } int QuestionToken { get; } @@ -67,6 +69,7 @@ internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService public abstract int ConflictMarkerTrivia { get; } public abstract int DisabledTextTrivia { get; } public abstract int EndOfLineTrivia { get; } + public abstract int SkippedTokensTrivia { get; } public abstract int DotToken { get; } public abstract int QuestionToken { get; } diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb index 8be6e2040a1..370b7028ec2 100644 --- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb +++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb @@ -226,8 +226,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Return VisualBasicSyntaxGenerator.GetParameterList(node) End Function - Public Function IsSkippedTokensTrivia(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsSkippedTokensTrivia - Return TypeOf node Is SkippedTokensTriviaSyntax + Private Function ISyntaxFacts_IsSkippedTokensTrivia(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsSkippedTokensTrivia + Return IsSkippedTokensTrivia(node) End Function Public Function ISyntaxFactsService_HasIncompleteParentMember(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.HasIncompleteParentMember diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb index ea22cbe7f5e..9f0002848dc 100644 --- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb +++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb @@ -21,6 +21,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices Public Overrides ReadOnly Property ConflictMarkerTrivia As Integer = SyntaxKind.ConflictMarkerTrivia Public Overrides ReadOnly Property DisabledTextTrivia As Integer = SyntaxKind.DisabledTextTrivia Public Overrides ReadOnly Property EndOfLineTrivia As Integer = SyntaxKind.EndOfLineTrivia + Public Overrides ReadOnly Property SkippedTokensTrivia As Integer = SyntaxKind.SkippedTokensTrivia Public Overrides ReadOnly Property DotToken As Integer = SyntaxKind.DotToken Public Overrides ReadOnly Property QuestionToken As Integer = SyntaxKind.QuestionToken -- GitLab