From 008682140dfded0956241e81214a860a978b2395 Mon Sep 17 00:00:00 2001 From: pgavlin Date: Tue, 6 Jan 2015 17:04:59 -0800 Subject: [PATCH] Remove all Obsolete public APIs. ***NO_CI*** (changeset 1393197) --- .../CSharp/Portable/CSharpExtensions.cs | 38 +------------- .../Portable/Syntax/CSharpSyntaxNode.cs | 8 +-- .../Core/Portable/Symbols/TypeKind.cs | 11 +---- .../Portable/Syntax/VisualBasicSyntaxNode.vb | 7 +-- .../Portable/VisualBasicExtensions.vb | 49 ------------------- 5 files changed, 4 insertions(+), 109 deletions(-) diff --git a/Src/Compilers/CSharp/Portable/CSharpExtensions.cs b/Src/Compilers/CSharp/Portable/CSharpExtensions.cs index b8e060e1fa4..32199bfd95a 100644 --- a/Src/Compilers/CSharp/Portable/CSharpExtensions.cs +++ b/Src/Compilers/CSharp/Portable/CSharpExtensions.cs @@ -19,12 +19,6 @@ public static bool IsKind(this SyntaxToken token, SyntaxKind kind) return token.RawKind == (int)kind; } - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static bool IsContextualKind(this SyntaxToken token, SyntaxKind kind) - { - return token.CSharpContextualKind() == kind; - } - public static bool IsKind(this SyntaxTrivia trivia, SyntaxKind kind) { return trivia.RawKind == (int)kind; @@ -40,41 +34,11 @@ public static bool IsKind(this SyntaxNodeOrToken nodeOrToken, SyntaxKind kind) return nodeOrToken.RawKind == (int)kind; } - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static SyntaxKind CSharpKind(this SyntaxToken token) - { - return token.Kind(); - } - - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static SyntaxKind CSharpContextualKind(this SyntaxToken token) - { - return (object)token.Language == (object)LanguageNames.CSharp ? (SyntaxKind)token.RawContextualKind : SyntaxKind.None; - } - internal static SyntaxKind ContextualKind(this SyntaxToken token) { return (object)token.Language == (object)LanguageNames.CSharp ? (SyntaxKind)token.RawContextualKind : SyntaxKind.None; } - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static SyntaxKind CSharpKind(this SyntaxTrivia trivia) - { - return trivia.Kind(); - } - - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static SyntaxKind CSharpKind(this SyntaxNode node) - { - return node.Kind(); - } - - [Obsolete("To be removed, use Kind() or IsKind() instead.", true), EditorBrowsable(EditorBrowsableState.Never)] - public static SyntaxKind CSharpKind(this SyntaxNodeOrToken nodeOrToken) - { - return nodeOrToken.Kind(); - } - /// /// Returns the index of the first node of a specified kind in the node list. /// @@ -1561,4 +1525,4 @@ public static IRangeVariableSymbol GetDeclaredSymbol(this SemanticModel semantic } #endregion } -} \ No newline at end of file +} diff --git a/Src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxNode.cs b/Src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxNode.cs index b46be947bcd..b8a36ff5541 100644 --- a/Src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxNode.cs +++ b/Src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxNode.cs @@ -121,12 +121,6 @@ public SyntaxKind Kind() return (SyntaxKind)this.Green.RawKind; } - [Obsolete("To be removed, use Kind() instead."), EditorBrowsable(EditorBrowsableState.Never)] - public SyntaxKind CSharpKind() - { - return (SyntaxKind)this.Green.RawKind; - } - protected override string KindText { get @@ -935,4 +929,4 @@ protected override bool IsEquivalentToCore(SyntaxNode node, bool topLevel = fals #endregion } -} \ No newline at end of file +} diff --git a/Src/Compilers/Core/Portable/Symbols/TypeKind.cs b/Src/Compilers/Core/Portable/Symbols/TypeKind.cs index e16f4b1b060..38bc201eda5 100644 --- a/Src/Compilers/Core/Portable/Symbols/TypeKind.cs +++ b/Src/Compilers/Core/Portable/Symbols/TypeKind.cs @@ -19,9 +19,6 @@ public enum TypeKind : byte /// Type is an array type. /// Array = 1, - [Obsolete("Use TypeKind.Array instead of TypeKind.ArrayType. The latter is going away.")] - [EditorBrowsable(EditorBrowsableState.Never)] - ArrayType = 1, /// /// Type is a class. @@ -37,9 +34,6 @@ public enum TypeKind : byte /// Type is dynamic. /// Dynamic = 4, - [Obsolete("Use TypeKind.Dynamic instead of TypeKind.DynamicType. The latter is going away.")] - [EditorBrowsable(EditorBrowsableState.Never)] - DynamicType = 4, /// /// Type is an enumeration. @@ -65,9 +59,6 @@ public enum TypeKind : byte /// Type is a pointer. /// Pointer = 9, - [Obsolete("Use TypeKind.Pointer instead of TypeKind.PointerType. The latter is going away.")] - [EditorBrowsable(EditorBrowsableState.Never)] - PointerType = 9, /// /// Type is a C# struct or VB Structure @@ -89,4 +80,4 @@ public enum TypeKind : byte /// Submission = 12, } -} \ No newline at end of file +} diff --git a/Src/Compilers/VisualBasic/Portable/Syntax/VisualBasicSyntaxNode.vb b/Src/Compilers/VisualBasic/Portable/Syntax/VisualBasicSyntaxNode.vb index f72186b4dcc..980d6e7bfaf 100644 --- a/Src/Compilers/VisualBasic/Portable/Syntax/VisualBasicSyntaxNode.vb +++ b/Src/Compilers/VisualBasic/Portable/Syntax/VisualBasicSyntaxNode.vb @@ -114,11 +114,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Return CType(Me.Green.RawKind, SyntaxKind) End Function - - Public Function VBKind() As SyntaxKind - Return CType(Me.Green.RawKind, SyntaxKind) - End Function - Protected Overrides ReadOnly Property KindText As String Get Return Me.Kind.ToString() @@ -688,4 +683,4 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End Function End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/Src/Compilers/VisualBasic/Portable/VisualBasicExtensions.vb b/Src/Compilers/VisualBasic/Portable/VisualBasicExtensions.vb index 69afc240356..c24bb5a1e8c 100644 --- a/Src/Compilers/VisualBasic/Portable/VisualBasicExtensions.vb +++ b/Src/Compilers/VisualBasic/Portable/VisualBasicExtensions.vb @@ -17,44 +17,6 @@ Namespace Microsoft.CodeAnalysis ''' Public Module VisualBasicExtensions - ''' - ''' Returns SyntaxKind for SyntaxTrivia nodes. - ''' - - Public Function VBKind(trivia As SyntaxTrivia) As SyntaxKind - Return Kind(trivia) - End Function - - ''' - ''' Returns SyntaxKind for SyntaxToken from RawKind property. - ''' - - Public Function VBKind(token As SyntaxToken) As SyntaxKind - Return Kind(token) - End Function - - ''' - ''' Returns SyntaxKind for SyntaxToken from RawContextualKind. - ''' - - Public Function VisualBasicContextualKind(token As SyntaxToken) As SyntaxKind - Return If(token.Language Is LanguageNames.VisualBasic, CType(token.RawContextualKind, SyntaxKind), SyntaxKind.None) - End Function - - ''' - ''' Returns SyntaxKind for SyntaxNode from RawKind property. - ''' - - Public Function VBKind(node As SyntaxNode) As SyntaxKind - Return Kind(node) - End Function - - - - Public Function VBKind(nodeOrToken As SyntaxNodeOrToken) As SyntaxKind - Return Kind(nodeOrToken) - End Function - ''' ''' Determines if SyntaxTrivia is a specified kind. ''' @@ -75,17 +37,6 @@ Namespace Microsoft.CodeAnalysis Return token.RawKind = kind End Function - ''' - ''' Determines if SyntaxToken is a specified kind. - ''' - '''The Source SyntaxToken. - ''' The SyntaxKind to test for. - ''' A boolean value if token is of specified kind; otherwise false. - - Public Function IsContextualKind(token As SyntaxToken, kind As SyntaxKind) As Boolean - Return token.VisualBasicContextualKind = kind - End Function - ''' ''' Determines if SyntaxNode is a specified kind. ''' -- GitLab