Fixup

Author: CyrusNajmabadi

src/Features/CSharp/Portable/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsCodeFixProvider.cs

@@ -6,6 +6,7 @@
 using System.Collections.Immutable;
 using System.Composition;
 using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.GenerateDefaultConstructors;
 using Microsoft.CodeAnalysis.Host.Mef;
 
@@ -26,5 +27,8 @@ public CSharpGenerateDefaultConstructorsCodeFixProvider()
 
         public override ImmutableArray<string> FixableDiagnosticIds { get; } =
             ImmutableArray.Create(CS1729, CS7036, CS8983);
+
+        protected override SyntaxToken? TryGetTypeName(SyntaxNode typeDeclaration)
+            => (typeDeclaration as BaseTypeDeclarationSyntax)?.Identifier;
     }
 }

src/Features/Core/Portable/GenerateDefaultConstructors/AbstractGenerateDefaultConstructorCodeFixProvider.cs

@@ -15,6 +15,8 @@ internal abstract class AbstractGenerateDefaultConstructorCodeFixProvider : Code
     {
         public override FixAllProvider? GetFixAllProvider() => null;
 
+        protected abstract SyntaxToken? TryGetTypeName(SyntaxNode typeDeclaration);
+
         public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             var cancellationToken = context.CancellationToken;
@@ -23,17 +25,18 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
             if (diagnostic == null)
                 return;
 
-            var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
-            var headerFacts = document.GetRequiredLanguageService<IHeaderFactsService>();
-
             var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var headerFacts = document.GetRequiredLanguageService<IHeaderFactsService>();
             if (!headerFacts.IsOnTypeHeader(root, diagnostic.Location.SourceSpan.Start, fullHeader: true, out var typeDecl))
                 return;
 
-            var typeName = syntaxFacts.GetIdentifierOfTypeDeclaration(typeDecl);
+            var typeName = TryGetTypeName(typeDecl);
+            if (typeName == null)
+                return;
+
             var service = document.GetRequiredLanguageService<IGenerateDefaultConstructorsService>();
             var actions = await service.GenerateDefaultConstructorsAsync(
-                document, new TextSpan(typeName.Span.Start, 0), forRefactoring: false, cancellationToken).ConfigureAwait(false);
+                document, new TextSpan(typeName.Value.Span.Start, 0), forRefactoring: false, cancellationToken).ConfigureAwait(false);
             context.RegisterFixes(actions, diagnostic);
         }
     }

src/Features/VisualBasic/Portable/GenerateDefaultConstructors/VisualBasicGenerateDefaultConstructorsCodeFixProvider.vb

@@ -7,6 +7,7 @@ Imports System.Composition
 Imports Microsoft.CodeAnalysis.CodeFixes
 Imports Microsoft.CodeAnalysis.GenerateDefaultConstructors
 Imports Microsoft.CodeAnalysis.Host.Mef
+Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateDefaultConstructors
     <ExportCodeFixProvider(LanguageNames.VisualBasic, Name:=PredefinedCodeFixProviderNames.GenerateDefaultConstructors), [Shared]>
@@ -23,5 +24,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateDefaultConstructors
 
         Public Overrides ReadOnly Property FixableDiagnosticIds As Immutable.ImmutableArray(Of String) =
             ImmutableArray.Create(BC30387, BC40056)
+
+        Protected Overrides Function TryGetTypeName(typeDeclaration As SyntaxNode) As SyntaxToken?
+            Return TryCast(typeDeclaration, TypeBlockSyntax)?.BlockStatement.Identifier
+        End Function
     End Class
 End Namespace