Skip to content

Fix annotation on XmlElement constructor parameter #71860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 4 commits into from
Jul 10, 2022
Merged

Fix annotation on XmlElement constructor parameter #71860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ce68cb
Fixes #71858
SteveDunn Jul 8, 2022
1c27446
Add nullable annotation to other methods that take a nullable prefix …
SteveDunn Jul 9, 2022
dbaeda8
Annotate missing methed on ref XmlElement
SteveDunn Jul 10, 2022
384e425
More annotations
SteveDunn Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal XmlElement(XmlName name, bool empty, XmlDocument doc) : base(doc)
}
}

protected internal XmlElement(string prefix, string localName, string? namespaceURI, XmlDocument doc)
protected internal XmlElement(string? prefix, string localName, string? namespaceURI, XmlDocument doc)
Comment thread
SteveDunn marked this conversation as resolved.
: this(doc.AddXmlName(prefix, localName, namespaceURI, null), true, doc)
{
}
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/System.Private.Xml/src/System/Xml/XPath/XPathNavigator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ public virtual void DeleteSelf()
DeleteRange(this);
}

public virtual void PrependChildElement(string prefix, string localName, string namespaceURI, string value)
public virtual void PrependChildElement(string? prefix, string localName, string? namespaceURI, string? value)
{
XmlWriter writer = PrependChild();
writer.WriteStartElement(prefix, localName, namespaceURI);
Expand All @@ -1578,7 +1578,7 @@ public virtual void PrependChildElement(string prefix, string localName, string
writer.Close();
}

public virtual void AppendChildElement(string prefix, string localName, string namespaceURI, string value)
public virtual void AppendChildElement(string? prefix, string localName, string? namespaceURI, string? value)
{
XmlWriter writer = AppendChild();
writer.WriteStartElement(prefix, localName, namespaceURI);
Expand All @@ -1590,7 +1590,7 @@ public virtual void AppendChildElement(string prefix, string localName, string n
writer.Close();
}

public virtual void InsertElementBefore(string prefix, string localName, string namespaceURI, string value)
public virtual void InsertElementBefore(string? prefix, string localName, string? namespaceURI, string? value)
{
XmlWriter writer = InsertBefore();
writer.WriteStartElement(prefix, localName, namespaceURI);
Expand All @@ -1602,7 +1602,7 @@ public virtual void InsertElementBefore(string prefix, string localName, string
writer.Close();
}

public virtual void InsertElementAfter(string prefix, string localName, string namespaceURI, string value)
public virtual void InsertElementAfter(string? prefix, string localName, string? namespaceURI, string? value)
{
XmlWriter writer = InsertAfter();
writer.WriteStartElement(prefix, localName, namespaceURI);
Expand All @@ -1614,7 +1614,7 @@ public virtual void InsertElementAfter(string prefix, string localName, string n
writer.Close();
}

public virtual void CreateAttribute(string prefix, string localName, string namespaceURI, string value)
public virtual void CreateAttribute(string? prefix, string localName, string? namespaceURI, string? value)
{
XmlWriter writer = CreateAttributes();
writer.WriteStartAttribute(prefix, localName, namespaceURI);
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public override void WriteTo(System.Xml.XmlWriter w) { }
}
public partial class XmlElement : System.Xml.XmlLinkedNode
{
protected internal XmlElement(string prefix, string localName, string? namespaceURI, System.Xml.XmlDocument doc) { }
protected internal XmlElement(string? prefix, string localName, string? namespaceURI, System.Xml.XmlDocument doc) { }
public override System.Xml.XmlAttributeCollection Attributes { get { throw null; } }
public virtual bool HasAttributes { get { throw null; } }
public override string InnerText { get { throw null; } set { } }
Expand Down Expand Up @@ -2649,12 +2649,12 @@ protected XPathNavigator() { }
public virtual void AppendChild(string newChild) { }
public virtual void AppendChild(System.Xml.XmlReader newChild) { }
public virtual void AppendChild(System.Xml.XPath.XPathNavigator newChild) { }
public virtual void AppendChildElement(string prefix, string localName, string namespaceURI, string value) { }
public virtual void AppendChildElement(string? prefix, string localName, string? namespaceURI, string? value) { }
public virtual bool CheckValidity(System.Xml.Schema.XmlSchemaSet schemas, System.Xml.Schema.ValidationEventHandler validationEventHandler) { throw null; }
public abstract System.Xml.XPath.XPathNavigator Clone();
public virtual System.Xml.XmlNodeOrder ComparePosition(System.Xml.XPath.XPathNavigator? nav) { throw null; }
public virtual System.Xml.XPath.XPathExpression Compile(string xpath) { throw null; }
public virtual void CreateAttribute(string prefix, string localName, string namespaceURI, string value) { }
public virtual void CreateAttribute(string? prefix, string localName, string? namespaceURI, string? value) { }
public virtual System.Xml.XmlWriter CreateAttributes() { throw null; }
public virtual System.Xml.XPath.XPathNavigator CreateNavigator() { throw null; }
public virtual void DeleteRange(System.Xml.XPath.XPathNavigator lastSiblingToDelete) { }
Expand All @@ -2674,8 +2674,8 @@ public virtual void InsertAfter(System.Xml.XPath.XPathNavigator newSibling) { }
public virtual void InsertBefore(string newSibling) { }
public virtual void InsertBefore(System.Xml.XmlReader newSibling) { }
public virtual void InsertBefore(System.Xml.XPath.XPathNavigator newSibling) { }
public virtual void InsertElementAfter(string prefix, string localName, string namespaceURI, string value) { }
public virtual void InsertElementBefore(string prefix, string localName, string namespaceURI, string value) { }
public virtual void InsertElementAfter(string? prefix, string localName, string? namespaceURI, string? value) { }
public virtual void InsertElementBefore(string? prefix, string localName, string? namespaceURI, string? value) { }
public virtual bool IsDescendant([System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] System.Xml.XPath.XPathNavigator? nav) { throw null; }
public abstract bool IsSamePosition(System.Xml.XPath.XPathNavigator other);
public virtual string? LookupNamespace(string prefix) { throw null; }
Expand Down Expand Up @@ -2710,7 +2710,7 @@ public virtual void MoveToRoot() { }
public virtual void PrependChild(string newChild) { }
public virtual void PrependChild(System.Xml.XmlReader newChild) { }
public virtual void PrependChild(System.Xml.XPath.XPathNavigator newChild) { }
public virtual void PrependChildElement(string prefix, string localName, string namespaceURI, string value) { }
public virtual void PrependChildElement(string? prefix, string localName, string? namespaceURI, string? value) { }
public virtual System.Xml.XmlReader ReadSubtree() { throw null; }
public virtual System.Xml.XmlWriter ReplaceRange(System.Xml.XPath.XPathNavigator lastSiblingToReplace) { throw null; }
public virtual void ReplaceSelf(string newNode) { }
Expand Down