Skip to content

Commit 86b5753

Browse files
desjoerddesjoerd
committed
Fix dereference null warning because the compiler cannot analyze it from a boolean value
1 parent c51cec1 commit 86b5753

9 files changed

+37
-28
lines changed

‎src/OpenApi/gen/XmlCommentGenerator.Emitter.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
464464
// Apply comments from the property
465465
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
466466
{
467-
var isInlinedSchema = schema.Metadata is null
467+
if(schema.Metadata is null
468468
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
469-
|| string.IsNullOrEmpty(schemaId as string);
470-
if(isInlinedSchema)
469+
|| string.IsNullOrEmpty(schemaId as string))
471470
{
471+
// Inlined schema
472472
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
473473
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
474474
{
@@ -477,6 +477,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
477477
}
478478
else
479479
{
480+
// Schema Reference
480481
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
481482
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
482483
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//HintName: OpenApiXmlCommentSupport.generated.cs
1+
//HintName: OpenApiXmlCommentSupport.generated.cs
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
@@ -446,11 +446,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
446446
// Apply comments from the property
447447
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
448448
{
449-
var isInlinedSchema = schema.Metadata is null
449+
if(schema.Metadata is null
450450
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
451-
|| string.IsNullOrEmpty(schemaId as string);
452-
if(isInlinedSchema)
451+
|| string.IsNullOrEmpty(schemaId as string))
453452
{
453+
// Inlined schema
454454
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
455455
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
456456
{
@@ -459,6 +459,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
459459
}
460460
else
461461
{
462+
// Schema Reference
462463
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
463464
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
464465
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,11 +475,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
475475
// Apply comments from the property
476476
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
477477
{
478-
var isInlinedSchema = schema.Metadata is null
478+
if(schema.Metadata is null
479479
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
480-
|| string.IsNullOrEmpty(schemaId as string);
481-
if(isInlinedSchema)
480+
|| string.IsNullOrEmpty(schemaId as string))
482481
{
482+
// Inlined schema
483483
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
484484
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
485485
{
@@ -488,6 +488,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
488488
}
489489
else
490490
{
491+
// Schema Reference
491492
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
492493
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
493494
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
567567
// Apply comments from the property
568568
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
569569
{
570-
var isInlinedSchema = schema.Metadata is null
570+
if(schema.Metadata is null
571571
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
572-
|| string.IsNullOrEmpty(schemaId as string);
573-
if(isInlinedSchema)
572+
|| string.IsNullOrEmpty(schemaId as string))
574573
{
574+
// Inlined schema
575575
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
576576
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
577577
{
@@ -580,6 +580,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
580580
}
581581
else
582582
{
583+
// Schema Reference
583584
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
584585
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
585586
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
450450
// Apply comments from the property
451451
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
452452
{
453-
var isInlinedSchema = schema.Metadata is null
453+
if(schema.Metadata is null
454454
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
455-
|| string.IsNullOrEmpty(schemaId as string);
456-
if(isInlinedSchema)
455+
|| string.IsNullOrEmpty(schemaId as string))
457456
{
457+
// Inlined schema
458458
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
459459
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
460460
{
@@ -463,6 +463,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
463463
}
464464
else
465465
{
466+
// Schema Reference
466467
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
467468
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
468469
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
468468
// Apply comments from the property
469469
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
470470
{
471-
var isInlinedSchema = schema.Metadata is null
471+
if(schema.Metadata is null
472472
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
473-
|| string.IsNullOrEmpty(schemaId as string);
474-
if(isInlinedSchema)
473+
|| string.IsNullOrEmpty(schemaId as string))
475474
{
475+
// Inlined schema
476476
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
477477
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
478478
{
@@ -481,6 +481,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
481481
}
482482
else
483483
{
484+
// Schema Reference
484485
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
485486
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
486487
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
476476
// Apply comments from the property
477477
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
478478
{
479-
var isInlinedSchema = schema.Metadata is null
479+
if(schema.Metadata is null
480480
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
481-
|| string.IsNullOrEmpty(schemaId as string);
482-
if(isInlinedSchema)
481+
|| string.IsNullOrEmpty(schemaId as string))
483482
{
483+
// Inlined schema
484484
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
485485
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
486486
{
@@ -489,6 +489,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
489489
}
490490
else
491491
{
492+
// Schema Reference
492493
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
493494
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
494495
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.XmlCommentsOnPropertiesShouldApplyToSchemaReferences#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
455455
// Apply comments from the property
456456
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
457457
{
458-
var isInlinedSchema = schema.Metadata is null
458+
if(schema.Metadata is null
459459
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
460-
|| string.IsNullOrEmpty(schemaId as string);
461-
if(isInlinedSchema)
460+
|| string.IsNullOrEmpty(schemaId as string))
462461
{
462+
// Inlined schema
463463
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
464464
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
465465
{
@@ -468,6 +468,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
468468
}
469469
else
470470
{
471+
// Schema Reference
471472
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
472473
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
473474
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/XmlCommentDocumentationIdTests.CanMergeXmlCommentsWithDifferentDocumentationIdFormats#OpenApiXmlCommentSupport.generated.verified.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,11 +447,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
447447
// Apply comments from the property
448448
if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
449449
{
450-
var isInlinedSchema = schema.Metadata is null
450+
if(schema.Metadata is null
451451
|| !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
452-
|| string.IsNullOrEmpty(schemaId as string);
453-
if(isInlinedSchema)
452+
|| string.IsNullOrEmpty(schemaId as string))
454453
{
454+
// Inlined schema
455455
schema.Description = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
456456
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
457457
{
@@ -460,6 +460,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
460460
}
461461
else
462462
{
463+
// Schema Reference
463464
schema.Metadata["x-ref-description"] = propertyComment.Value ?? propertyComment.Returns ?? propertyComment.Summary;
464465
if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
465466
{

0 commit comments

Comments
 (0)