Skip to content

Commit 8a0684c

Browse files
author
Julien Couvreur
authored
Extensions: rename syntax node (#78625)
1 parent d219c4f commit 8a0684c

File tree

36 files changed

+333
-334
lines changed

36 files changed

+333
-334
lines changed

‎src/Compilers/CSharp/CSharpAnalyzerDriver/CSharpDeclarationComputer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private static void ComputeDeclarations(
123123
goto case SyntaxKind.InterfaceDeclaration;
124124
}
125125
case SyntaxKind.InterfaceDeclaration:
126-
case SyntaxKind.ExtensionDeclaration:
126+
case SyntaxKind.ExtensionBlockDeclaration:
127127
{
128128
var t = (TypeDeclarationSyntax)node;
129129
foreach (var decl in t.Members)

‎src/Compilers/CSharp/Portable/Binder/BinderFactory.BinderFactoryVisitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ public override Binder VisitInterfaceDeclaration(InterfaceDeclarationSyntax node
815815
public override Binder VisitRecordDeclaration(RecordDeclarationSyntax node)
816816
=> VisitTypeDeclarationCore(node);
817817

818-
public override Binder VisitExtensionDeclaration(ExtensionDeclarationSyntax node)
818+
public override Binder VisitExtensionBlockDeclaration(ExtensionBlockDeclarationSyntax node)
819819
=> VisitTypeDeclarationCore(node);
820820

821821
public sealed override Binder VisitNamespaceDeclaration(NamespaceDeclarationSyntax parent)
@@ -1248,7 +1248,7 @@ private Binder GetParameterNameAttributeValueBinder(MemberDeclarationSyntax memb
12481248

12491249
return new WithParametersBinder(method.Parameters, nextBinder);
12501250
}
1251-
else if (memberSyntax is ExtensionDeclarationSyntax extensionDeclaration)
1251+
else if (memberSyntax is ExtensionBlockDeclarationSyntax extensionDeclaration)
12521252
{
12531253
Binder outerBinder = VisitCore(memberSyntax);
12541254
SourceNamedTypeSymbol type = ((NamespaceOrTypeSymbol)outerBinder.ContainingMemberOrLambda).GetSourceTypeMember((TypeDeclarationSyntax)memberSyntax);

‎src/Compilers/CSharp/Portable/Compilation/SyntaxTreeSemanticModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ private NamedTypeSymbol GetDeclaredType(BaseTypeDeclarationSyntax declarationSyn
13811381
{
13821382
Debug.Assert(declarationSyntax != null);
13831383

1384-
if (declarationSyntax is ExtensionDeclarationSyntax extensionDeclaration)
1384+
if (declarationSyntax is ExtensionBlockDeclarationSyntax extensionDeclaration)
13851385
{
13861386
return GetDeclaredExtension(extensionDeclaration);
13871387
}
@@ -1390,7 +1390,7 @@ private NamedTypeSymbol GetDeclaredType(BaseTypeDeclarationSyntax declarationSyn
13901390
return GetDeclaredNamedType(declarationSyntax, name);
13911391
}
13921392

1393-
private NamedTypeSymbol GetDeclaredExtension(ExtensionDeclarationSyntax extensionDeclaration)
1393+
private NamedTypeSymbol GetDeclaredExtension(ExtensionBlockDeclarationSyntax extensionDeclaration)
13941394
{
13951395
Debug.Assert(extensionDeclaration != null);
13961396

@@ -2033,7 +2033,7 @@ private ParameterSymbol GetExtensionParameterSymbol(
20332033
{
20342034
Debug.Assert(parameter != null);
20352035

2036-
if (parameter.Parent is not ParameterListSyntax { Parent: ExtensionDeclarationSyntax extensionDecl })
2036+
if (parameter.Parent is not ParameterListSyntax { Parent: ExtensionBlockDeclarationSyntax extensionDecl })
20372037
{
20382038
return null;
20392039
}

‎src/Compilers/CSharp/Portable/Declarations/DeclarationKind.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ internal static DeclarationKind ToDeclarationKind(this SyntaxKind kind)
4343
case SyntaxKind.DelegateDeclaration: return DeclarationKind.Delegate;
4444
case SyntaxKind.RecordDeclaration: return DeclarationKind.Record;
4545
case SyntaxKind.RecordStructDeclaration: return DeclarationKind.RecordStruct;
46-
case SyntaxKind.ExtensionDeclaration: return DeclarationKind.Extension;
46+
case SyntaxKind.ExtensionBlockDeclaration: return DeclarationKind.Extension;
4747
default:
4848
throw ExceptionUtilities.UnexpectedValue(kind);
4949
}

‎src/Compilers/CSharp/Portable/Declarations/DeclarationTreeBuilder.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ public override SingleNamespaceOrTypeDeclaration VisitRecordDeclaration(RecordDe
681681
return VisitTypeDeclaration(node, declarationKind);
682682
}
683683

684-
public override SingleNamespaceOrTypeDeclaration VisitExtensionDeclaration(ExtensionDeclarationSyntax node)
684+
public override SingleNamespaceOrTypeDeclaration VisitExtensionBlockDeclaration(ExtensionBlockDeclarationSyntax node)
685685
{
686686
return VisitTypeDeclaration(node, DeclarationKind.Extension);
687687
}
@@ -944,7 +944,7 @@ private BoxedMemberNames GetNonTypeMemberNames(
944944
anyMethodHadExtensionSyntax = true;
945945
}
946946

947-
if (!anyExtensionDeclarationSyntax && member.Kind == SyntaxKind.ExtensionDeclaration)
947+
if (!anyExtensionDeclarationSyntax && member.Kind == SyntaxKind.ExtensionBlockDeclaration)
948948
{
949949
anyExtensionDeclarationSyntax = true;
950950
}
@@ -1107,7 +1107,7 @@ private static bool CheckMemberForAttributes(Syntax.InternalSyntax.CSharpSyntaxN
11071107
case SyntaxKind.EnumDeclaration:
11081108
case SyntaxKind.RecordDeclaration:
11091109
case SyntaxKind.RecordStructDeclaration:
1110-
case SyntaxKind.ExtensionDeclaration:
1110+
case SyntaxKind.ExtensionBlockDeclaration:
11111111
return (((Syntax.InternalSyntax.BaseTypeDeclarationSyntax)member).AttributeLists).Any();
11121112

11131113
case SyntaxKind.DelegateDeclaration:

‎src/Compilers/CSharp/Portable/Declarations/MergedTypeDeclaration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public ImmutableArray<SyntaxList<AttributeListSyntax>> GetAttributeDeclarations(
7878
case SyntaxKind.InterfaceDeclaration:
7979
case SyntaxKind.RecordDeclaration:
8080
case SyntaxKind.RecordStructDeclaration:
81-
case SyntaxKind.ExtensionDeclaration:
81+
case SyntaxKind.ExtensionBlockDeclaration:
8282
attributesSyntaxList = ((TypeDeclarationSyntax)typeDecl).AttributeLists;
8383
break;
8484

‎src/Compilers/CSharp/Portable/Declarations/SingleTypeDeclaration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ internal enum TypeDeclarationFlags : ushort
6969
HasPrimaryConstructor = 1 << 11,
7070

7171
/// <summary>
72-
/// Set when <see cref="Syntax.ExtensionDeclarationSyntax"/> is present.
72+
/// Set when <see cref="Syntax.ExtensionBlockDeclarationSyntax"/> is present.
7373
/// </summary>
7474
AnyExtensionDeclarationSyntax = 1 << 12,
7575
}

‎src/Compilers/CSharp/Portable/Generated/CSharp.Generated.g4‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)