Skip to content

Remove solution folders correctly #1468

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
merged 3 commits into from
Feb 2, 2017
Merged

Remove solution folders correctly #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7ce721
Properly loop deleted nodes and notify ProjectMgr of changes
RyanCavanaugh Jan 31, 2017
6787b6c
Version bump
RyanCavanaugh Jan 31, 2017
e2c377a
Update comment
RyanCavanaugh Feb 2, 2017
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
9 changes: 6 additions & 3 deletions Common/Product/SharedProject/HierarchyNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,8 @@ public virtual void Remove(bool removeFromStorage) {

RaiseOnItemRemoved(documentToRemove, filesToBeDeleted);

// When we don't call this it behaves properly also in Solution Explorer search result set
// Notify hierarchy event listeners that items have been invalidated
//ProjectMgr.OnInvalidateItems(this);
ProjectMgr.OnInvalidateItems(this);

// Dispose the node now that is deleted.
this.Dispose(true);
Expand Down Expand Up @@ -996,8 +995,12 @@ internal void RemoveNonDocument(bool removeFromStorage) {
ProjectMgr.OnItemDeleted(this);

// Remove child if any before removing from the hierarchy
for (HierarchyNode child = this.FirstChild; child != null; child = child.NextSibling) {
HierarchyNode child = this.FirstChild;
while (child != null) {
// Need to read NextSibling before calling Remove
var next = child.NextSibling;
child.Remove(removeFromStorage);
child = next;
}

// the project node has no parentNode
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
<Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools - Interactive Window</DisplayName>
<Description xml:space="preserve">Node.js Tools - Interactive Window.</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools</DisplayName>
<Description xml:space="preserve">Provides support for editing and debugging Node.js programs.</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Profiling/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
<Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools - Profiling</DisplayName>
<Description xml:space="preserve">Provides support for profiling Node.js projects</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand Down