Skip to content

Revert tree expansion logical changes from SDK modernization commit #775

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
johnml1135 merged 1 commit into from
Mar 23, 2026
+1 −1
Merged

Revert tree expansion logical changes from SDK modernization commit #775

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Common/Controls/DetailControls/Slice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ public virtual void GenerateChildren(XmlNode node, XmlNode caller, ICmObject obj
// || (fUseChildrenOfNode && XmlUtils.GetOptionalAttributeValue(node, "expansion") == "expanded")
// || (XmlUtils.GetOptionalAttributeValue(caller, "expansion") == "expanded")
// || Expansion == DataTree.TreeItemState.ktisCollapsedEmpty)
bool fExpand = XmlUtils.GetOptionalAttributeValue(node, "expansion") == "expanded";
bool fExpand = XmlUtils.GetOptionalAttributeValue(node, "expansion") != "doNotExpand";
Copy link

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string literal "doNotExpand" is a protocol value that’s easy to mistype and hard to discover/refactor. Consider centralizing it as a named constant (or using an enum-like pattern) and, if this value is intended to be case-insensitive in XML, using an explicit StringComparison to make that contract clear.

Suggested change
bool fExpand = XmlUtils.GetOptionalAttributeValue(node, "expansion") != "doNotExpand";
const string DoNotExpandExpansionValue = "doNotExpand";
bool fExpand = XmlUtils.GetOptionalAttributeValue(node, "expansion") != DoNotExpandExpansionValue;

Copilot uses AI. Check for mistakes.
if (fUsePersistentExpansion && m_mediator != null) // mediator null only in testing?
{
Expansion = DataTree.TreeItemState.ktisCollapsed; // Needs to be an expandable state to have ExpansionStateKey.
Expand Down
Loading