Use pattern matching for AnnotatableBase condition in ToDebugString methods

Copilot · AndriySvyryd · Copilot · commit efab5fd09af2 · 2025-08-26T00:53:32.000Z
Co-authored-by: AndriySvyryd &lt;6539701+AndriySvyryd@users.noreply.github.com&gt;
diff --git a/src/EFCore/Metadata/IReadOnlyComplexProperty.cs b/src/EFCore/Metadata/IReadOnlyComplexProperty.cs
@@ -91,7 +91,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt
             }
 
             if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0
-                && (this is RuntimeAnnotatableBase || (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))
+                && (this is RuntimeAnnotatableBase || this is AnnotatableBase { IsReadOnly: true }))
             {
                 var indexes = ((IProperty)this).GetPropertyIndexes();
                 builder.Append(' ').Append(indexes.Index);
diff --git a/src/EFCore/Metadata/IReadOnlyNavigation.cs b/src/EFCore/Metadata/IReadOnlyNavigation.cs
@@ -165,7 +165,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt
             }
 
             if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0
-                && (this is RuntimeAnnotatableBase || (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))
+                && (this is RuntimeAnnotatableBase || this is AnnotatableBase { IsReadOnly: true }))
             {
                 var indexes = ((INavigation)this).GetPropertyIndexes();
                 builder.Append(' ').Append(indexes.Index);
diff --git a/src/EFCore/Metadata/IReadOnlyProperty.cs b/src/EFCore/Metadata/IReadOnlyProperty.cs
@@ -433,7 +433,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt
             }
 
             if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0
-                && (this is RuntimeAnnotatableBase || (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))
+                && (this is RuntimeAnnotatableBase || this is AnnotatableBase { IsReadOnly: true }))
             {
                 var indexes = ((IProperty)this).GetPropertyIndexes();
                 builder.Append(' ').Append(indexes.Index);
diff --git a/src/EFCore/Metadata/IReadOnlySkipNavigation.cs b/src/EFCore/Metadata/IReadOnlySkipNavigation.cs
@@ -99,7 +99,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt
             }
 
             if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0
-                && (this is RuntimeAnnotatableBase || (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))
+                && (this is RuntimeAnnotatableBase || this is AnnotatableBase { IsReadOnly: true }))
             {
                 var indexes = ((ISkipNavigation)this).GetPropertyIndexes();
                 builder.Append(' ').Append(indexes.Index);

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0`
`94`		`- && (this is RuntimeAnnotatableBase \|\| (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))`
	`94`	`+ && (this is RuntimeAnnotatableBase \|\| this is AnnotatableBase { IsReadOnly: true }))`
`95`	`95`	`{`
`96`	`96`	`var indexes = ((IProperty)this).GetPropertyIndexes();`
`97`	`97`	`builder.Append(' ').Append(indexes.Index);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0`
`168`		`- && (this is RuntimeAnnotatableBase \|\| (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))`
	`168`	`+ && (this is RuntimeAnnotatableBase \|\| this is AnnotatableBase { IsReadOnly: true }))`
`169`	`169`	`{`
`170`	`170`	`var indexes = ((INavigation)this).GetPropertyIndexes();`
`171`	`171`	`builder.Append(' ').Append(indexes.Index);`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0`
`436`		`- && (this is RuntimeAnnotatableBase \|\| (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))`
	`436`	`+ && (this is RuntimeAnnotatableBase \|\| this is AnnotatableBase { IsReadOnly: true }))`
`437`	`437`	`{`
`438`	`438`	`var indexes = ((IProperty)this).GetPropertyIndexes();`
`439`	`439`	`builder.Append(' ').Append(indexes.Index);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ string ToDebugString(MetadataDebugStringOptions options = MetadataDebugStringOpt`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if ((options & MetadataDebugStringOptions.IncludePropertyIndexes) != 0`
`102`		`- && (this is RuntimeAnnotatableBase \|\| (this is AnnotatableBase annotatable && annotatable.IsReadOnly)))`
	`102`	`+ && (this is RuntimeAnnotatableBase \|\| this is AnnotatableBase { IsReadOnly: true }))`
`103`	`103`	`{`
`104`	`104`	`var indexes = ((ISkipNavigation)this).GetPropertyIndexes();`
`105`	`105`	`builder.Append(' ').Append(indexes.Index);`