From c8faf5efe447da880327c23ae729c39526bb334e Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Fri, 20 Nov 2020 14:45:55 +0100 Subject: [PATCH] Fixed warnings --- .../Conventions/XmlDocumentationProvider.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/XmlDocumentationProvider.cs b/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/XmlDocumentationProvider.cs index a00ad0df928..04bddf8b6b1 100644 --- a/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/XmlDocumentationProvider.cs +++ b/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/XmlDocumentationProvider.cs @@ -209,7 +209,7 @@ public XmlDocumentationProvider(IXmlDocumentationFileResolver fileResolver) out XDocument document)) { MemberName name = GetMemberElementName(member); - XElement element = document.XPathSelectElements(name.Path) + XElement? element = document.XPathSelectElements(name.Path) .FirstOrDefault(); ReplaceInheritdocElements(member, element); @@ -268,7 +268,7 @@ public XmlDocumentationProvider(IXmlDocumentationFileResolver fileResolver) private void ReplaceInheritdocElements( MemberInfo member, - XElement element) + XElement? element) { if (element is null) { @@ -357,12 +357,11 @@ private static MemberName GetMemberElementName(MemberInfo member) char prefixCode; string memberName = - member is Type memberType - && !string.IsNullOrEmpty(memberType.FullName) + member is Type { FullName: { Length: > 0 } } memberType ? memberType.FullName - : member.DeclaringType is null + : member.ReflectedType is null ? member.Name - : member.DeclaringType.FullName + "." + member.Name; + : member.ReflectedType.FullName! + "." + member.Name; switch (member.MemberType) { @@ -376,7 +375,7 @@ private static MemberName GetMemberElementName(MemberInfo member) var paramTypesList = string.Join(",", ((MethodBase)member).GetParameters() .Select(x => Regex - .Replace(x.ParameterType.FullName, + .Replace(x.ParameterType.FullName!, "(`[0-9]+)|(, .*?PublicKeyToken=[0-9a-z]*)", string.Empty) .Replace("[[", "{")