Merge pull request #52733 from Youssef1313/doc-comment-cleanup

Cleanup unused type parameters
dotnet · Apr 19, 2021 · 04d7570 · 04d7570
2 parents d25ea98 + 6f0ab27
commit 04d7570
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/EditorFeatures/CSharp/DocumentationComments/DocumentationCommentCommandHandler.cs b/src/EditorFeatures/CSharp/DocumentationComments/DocumentationCommentCommandHandler.cs
@@ -21,7 +21,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.DocumentationComments
     [Order(After = PredefinedCommandHandlerNames.Rename)]
     [Order(After = PredefinedCompletionNames.CompletionCommandHandler)]
     internal class DocumentationCommentCommandHandler
-        : AbstractDocumentationCommentCommandHandler<DocumentationCommentTriviaSyntax, MemberDeclarationSyntax>
+        : AbstractDocumentationCommentCommandHandler
     {
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]

diff --git a/...s/Core/Implementation/DocumentationComments/AbstractDocumentationCommentCommandHandler.cs b/...s/Core/Implementation/DocumentationComments/AbstractDocumentationCommentCommandHandler.cs
@@ -20,14 +20,12 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.DocumentationComments
 {
-    internal abstract class AbstractDocumentationCommentCommandHandler<TDocumentationComment, TMemberNode> :
+    internal abstract class AbstractDocumentationCommentCommandHandler :
         IChainedCommandHandler<TypeCharCommandArgs>,
         ICommandHandler<ReturnKeyCommandArgs>,
         ICommandHandler<InsertCommentCommandArgs>,
         IChainedCommandHandler<OpenLineAboveCommandArgs>,
         IChainedCommandHandler<OpenLineBelowCommandArgs>
-        where TDocumentationComment : SyntaxNode, IStructuredTriviaSyntax
-        where TMemberNode : SyntaxNode
     {
         private readonly IWaitIndicator _waitIndicator;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;

diff --git a/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb b/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb
@@ -3,10 +3,9 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.ComponentModel.Composition
-Imports System.Diagnostics.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.Editor.Host
 Imports Microsoft.CodeAnalysis.Editor.Implementation.DocumentationComments
-Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.VisualStudio.Commanding
 Imports Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion
 Imports Microsoft.VisualStudio.Text.Operations
@@ -19,10 +18,10 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.DocumentationComments
     <Order(After:=PredefinedCommandHandlerNames.Rename)>
     <Order(After:=PredefinedCompletionNames.CompletionCommandHandler)>
     Friend Class DocumentationCommentCommandHandler
-        Inherits AbstractDocumentationCommentCommandHandler(Of DocumentationCommentTriviaSyntax, DeclarationStatementSyntax)
+        Inherits AbstractDocumentationCommentCommandHandler
 
-        <ImportingConstructor()>
-        <SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification:="Used in test code: https://github.com/dotnet/roslyn/issues/42814")>
+        <ImportingConstructor>
+        <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
         Public Sub New(
             waitIndicator As IWaitIndicator,
             undoHistoryRegistry As ITextUndoHistoryRegistry,