Skip to content

Commit be0eb67

Browse files
authored
Rename from IncludeNonNullableReferenceTypeModifier to IncludeNotNullableReferenceTypeModifier (#41332)
1 parent 7b1a5b5 commit be0eb67

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

src/Compilers/CSharp/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private bool ShouldAddNullableAnnotation(ITypeSymbol type)
8989
break;
9090

9191
case CodeAnalysis.NullableAnnotation.NotAnnotated:
92-
if (format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier) &&
92+
if (format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier) &&
9393
!type.IsValueType &&
9494
(type as Symbols.PublicModel.TypeSymbol)?.UnderlyingTypeSymbol.IsTypeParameterDisallowingAnnotation() != true)
9595
{
@@ -807,7 +807,7 @@ private void AddTypeParameterConstraints(ImmutableArray<ITypeSymbol> typeArgumen
807807
break;
808808

809809
case CodeAnalysis.NullableAnnotation.NotAnnotated:
810-
if (format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier))
810+
if (format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier))
811811
{
812812
AddPunctuation(SyntaxKind.ExclamationToken);
813813
}

src/Compilers/CSharp/Portable/Symbols/Symbol.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ public virtual string GetDocumentationCommentXml(
817817
private static readonly SymbolDisplayFormat s_debuggerDisplayFormat =
818818
SymbolDisplayFormat.TestFormat
819819
.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier
820-
| SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)
820+
| SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)
821821
.WithCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.None);
822822

823823
internal virtual string GetDebuggerDisplay()

src/Compilers/CSharp/Portable/Symbols/TypeWithAnnotations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private TypeWithAnnotations(TypeSymbol defaultType, NullableAnnotation nullableA
6363
internal static readonly SymbolDisplayFormat TestDisplayFormat = new SymbolDisplayFormat(
6464
typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
6565
genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
66-
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier);
66+
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier);
6767

6868
internal static TypeWithAnnotations Create(bool isNullableEnabled, TypeSymbol typeSymbol, bool isAnnotated = false)
6969
{
@@ -306,7 +306,7 @@ public string ToDisplayString(SymbolDisplayFormat format = null)
306306
return str + "?";
307307
}
308308
else if (NullableAnnotation.IsNotAnnotated() &&
309-
format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier) &&
309+
format.MiscellaneousOptions.IncludesOption(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier) &&
310310
(!HasType || (!Type.IsValueType && !Type.IsTypeParameterDisallowingAnnotation())))
311311
{
312312
return str + "!";

src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Nullable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3857,7 +3857,7 @@ public class Program
38573857
}
38583858

38593859
private static readonly SymbolDisplayFormat _displayFormat = SymbolDisplayFormat.TestFormat.
3860-
WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.UseSpecialTypes).
3860+
WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.UseSpecialTypes).
38613861
WithCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.None);
38623862

38633863
private static void VerifyBytes(TypeWithAnnotations type, byte[] expectedPreviously, byte[] expectedNow, string expectedDisplay)

src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52495,11 +52495,11 @@ class F : C<F?>, I1<C<B?>>, I2<C<B>?>
5249552495

5249652496
Assert.Equal("String D1()", compilation.GetTypeByMetadataName("D1")
5249752497
.ToDisplayString(new SymbolDisplayFormat(delegateStyle: SymbolDisplayDelegateStyle.NameAndSignature,
52498-
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
52498+
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
5249952499

5250052500
Assert.Equal("String! D2()", compilation.GetTypeByMetadataName("D2")
5250152501
.ToDisplayString(new SymbolDisplayFormat(delegateStyle: SymbolDisplayDelegateStyle.NameAndSignature,
52502-
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
52502+
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
5250352503

5250452504
var f = compilation.GetTypeByMetadataName("F");
5250552505
Assert.Equal("C<F?>", f.BaseType().ToTestDisplayString());
@@ -72440,7 +72440,7 @@ void symbolValidator(ModuleSymbol m)
7244072440
Assert.Equal("void B.F2<T2>(T2 t2) where T2 : class?", f2.ToDisplayString(SymbolDisplayFormat.TestFormat.WithGenericsOptions(SymbolDisplayFormat.TestFormat.GenericsOptions | SymbolDisplayGenericsOptions.IncludeTypeConstraints)));
7244172441
Assert.Equal("void B.F2<T2>(T2 t2) where T2 : class", f2.ToDisplayString(SymbolDisplayFormat.TestFormat.WithGenericsOptions(SymbolDisplayFormat.TestFormat.GenericsOptions | SymbolDisplayGenericsOptions.IncludeTypeConstraints).
7244272442
WithMiscellaneousOptions(SymbolDisplayFormat.TestFormatWithConstraints.MiscellaneousOptions &
72443-
~(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier))));
72443+
~(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier))));
7244472444

7244572445
TypeParameterSymbol t2 = f2.TypeParameters[0];
7244672446
Assert.True(t2.ReferenceTypeConstraintIsNullable);
@@ -88385,7 +88385,7 @@ void assertNonNullTypesContext(NullableContextOptions nullableContextOptions)
8838588385
var comp = CreateCompilation(new[] { source }, options: compilationOptions);
8838688386

8838788387
var a = comp.GetTypeByMetadataName("A`1");
88388-
Assert.Equal("A<T> where T : class!", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88388+
Assert.Equal("A<T> where T : class!", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8838988389
}
8839088390
}
8839188391

@@ -88404,7 +88404,7 @@ class A<T> where T :
8840488404
var comp = CreateCompilation(new[] { source }, options: WithNonNullTypesTrue());
8840588405

8840688406
var a = comp.GetTypeByMetadataName("A`1");
88407-
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88407+
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8840888408
}
8840988409

8841088410
[Fact]
@@ -88429,7 +88429,7 @@ void assertNonNullTypesContext(NullableContextOptions nullableContextOptions)
8842988429

8843088430
var a = comp.GetTypeByMetadataName("A`1");
8843188431
Assert.Equal("A<T> where T : class?", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier)));
88432-
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88432+
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8843388433

8843488434
comp.VerifyDiagnostics();
8843588435
}
@@ -88451,7 +88451,7 @@ class A<T> where T : class
8845188451

8845288452
var a = comp.GetTypeByMetadataName("A`1");
8845388453
Assert.Equal("A<T> where T : class?", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier)));
88454-
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88454+
Assert.Equal("A<T> where T : class", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8845588455

8845688456
comp.VerifyDiagnostics(
8845788457
// (4,5): warning CS8632: The annotation for nullable reference types should only be used in code within a '#nullable' context.
@@ -88483,7 +88483,7 @@ void assertNonNullTypesContext(NullableContextOptions nullableContextOptions)
8848388483
var comp = CreateCompilation(new[] { source }, options: compilationOptions);
8848488484

8848588485
var a = comp.GetTypeByMetadataName("A`1");
88486-
Assert.Equal("A<T> where T : unmanaged!", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88486+
Assert.Equal("A<T> where T : unmanaged!", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8848788487
}
8848888488
}
8848988489

@@ -88504,7 +88504,7 @@ class unmanaged {}
8850488504
var comp = CreateCompilation(new[] { source }, options: WithNonNullTypesTrue());
8850588505

8850688506
var a = comp.GetTypeByMetadataName("A`1");
88507-
Assert.Equal("A<T> where T : unmanaged", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)));
88507+
Assert.Equal("A<T> where T : unmanaged", a.ToDisplayString(SymbolDisplayFormat.TestFormatWithConstraints.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)));
8850888508
}
8850988509

8851088510
[Fact]

src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5289,7 +5289,7 @@ class B
52895289
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier);
52905290

52915291
var formatWithNonNullableModifier = formatWithoutNonNullableModifier
5292-
.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)
5292+
.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)
52935293
.WithCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.None);
52945294

52955295
var method = comp.GetMember<IMethodSymbol>("B.F1");
@@ -5427,7 +5427,7 @@ class C
54275427
memberOptions: SymbolDisplayMemberOptions.IncludeType | SymbolDisplayMemberOptions.IncludeModifiers,
54285428
miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
54295429
var formatWithNullableModifier = formatWithoutModifiers.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier);
5430-
var formatWithBothModifiers = formatWithNullableModifier.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier);
5430+
var formatWithBothModifiers = formatWithNullableModifier.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier);
54315431

54325432
var member = comp.GetMember("C.F1");
54335433
Verify(

src/Compilers/Core/Portable/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Microsoft.CodeAnalysis.SarifVersion.Latest = 2147483647 -> Microsoft.CodeAnalysi
1919
Microsoft.CodeAnalysis.SarifVersion.Sarif1 = 1 -> Microsoft.CodeAnalysis.SarifVersion
2020
Microsoft.CodeAnalysis.SarifVersion.Sarif2 = 2 -> Microsoft.CodeAnalysis.SarifVersion
2121
Microsoft.CodeAnalysis.SarifVersionFacts
22-
Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier = 256 -> Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions
22+
Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier = 256 -> Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions
2323
static Microsoft.CodeAnalysis.SarifVersionFacts.TryParse(string version, out Microsoft.CodeAnalysis.SarifVersion result) -> bool
2424
Microsoft.CodeAnalysis.IMethodSymbol.IsConditional.get -> bool
2525
Microsoft.CodeAnalysis.Operations.IForEachLoopOperation.IsAsynchronous.get -> bool

src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayFormat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public class SymbolDisplayFormat
203203
/// A verbose format for displaying symbols (useful for testing).
204204
/// </summary>
205205
internal static readonly SymbolDisplayFormat TestFormatWithConstraints = TestFormat.WithGenericsOptions(TestFormat.GenericsOptions | SymbolDisplayGenericsOptions.IncludeTypeConstraints).
206-
AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier).
206+
AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier).
207207
WithCompilerInternalOptions(SymbolDisplayCompilerInternalOptions.None);
208208

209209
/// <summary>

src/Compilers/Core/Portable/SymbolDisplay/SymbolDisplayMiscellaneousOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public enum SymbolDisplayMiscellaneousOptions
7171
/// <summary>
7272
/// Append '!' to non-nullable reference types.
7373
/// </summary>
74-
IncludeNonNullableReferenceTypeModifier = 1 << 8,
74+
IncludeNotNullableReferenceTypeModifier = 1 << 8,
7575
}
7676
}

src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ internal static void VerifyUsesOfNullability(Symbol symbol, ImmutableArray<strin
10691069
UsesIsNullableVisitor.GetUses(builder, symbol);
10701070

10711071
var format = SymbolDisplayFormat.TestFormat
1072-
.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNonNullableReferenceTypeModifier)
1072+
.AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier | SymbolDisplayMiscellaneousOptions.IncludeNotNullableReferenceTypeModifier)
10731073
.RemoveParameterOptions(SymbolDisplayParameterOptions.IncludeName);
10741074

10751075
var symbols = builder.SelectAsArray(s => s.ToDisplayString(format));

0 commit comments

Comments
 (0)