Fixed bug 'The node is not parented by this object' when IXProject.Re…

…moveImport is used for `Import` elements inside `ImportGroup`. Related issue: 3F/DllExport#77 Also updated signature: `bool RemoveImport(ImportElement element, bool holdEmptyGroup = true)`
3F · Jul 13, 2018 · 3a97c3a · 3a97c3a
1 parent e23e44c
commit 3a97c3a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/MvsSln/Core/IXProject.cs b/MvsSln/Core/IXProject.cs
@@ -120,8 +120,9 @@ public interface IXProject
         /// To remove 'Import' element.
         /// </summary>
         /// <param name="element">Specified 'Import' element to remove.</param>
+        /// <param name="holdEmptyGroup">Holds empty group if it was inside.</param>
         /// <returns>true value if it has been removed.</returns>
-        bool RemoveImport(ImportElement element);
+        bool RemoveImport(ImportElement element, bool holdEmptyGroup = true);
 
         /// <summary>
         /// Retrieve the first found 'Import' element if it exists.

diff --git a/MvsSln/Core/XProject.cs b/MvsSln/Core/XProject.cs
@@ -197,14 +197,36 @@ public bool RemoveImport(string project)
         /// To remove 'Import' element.
         /// </summary>
         /// <param name="element">Specified 'Import' element to remove.</param>
+        /// <param name="holdEmptyGroup">Holds empty group if it was inside.</param>
         /// <returns>true value if it has been removed.</returns>
-        public bool RemoveImport(ImportElement element)
+        public bool RemoveImport(ImportElement element, bool holdEmptyGroup = true)
         {
             if(element.parentElement == null) {
                 return false;
             }
 
-            Project.Xml.RemoveChild(element.parentElement);
+            // https://github.com/3F/DllExport/issues/77
+            // 'The node is not parented by this object' if an `Import` element is already placed inside `ImportGroup`.
+            //Project.Xml.RemoveChild(element.parentElement);
+
+            var imp = element.parentElement;
+            if(imp.Parent is ProjectImportGroupElement container)
+            {
+                if(container.Imports.Count > 1) {
+                    container.RemoveChild(imp);
+                    return true;
+                }
+
+                if(holdEmptyGroup) {
+                    container.RemoveChild(imp); // leave as an ~ <ImportGroup />
+                }
+                else {
+                    Project.Xml.RemoveChild(container);
+                }
+                return true;
+            }
+
+            Project.Xml.RemoveChild(imp);
             return true;
         }