From 5fd037bc581c42a185769ed855f63e977d7ae438 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 3 Jan 2021 06:25:06 -0800 Subject: [PATCH] Fixed project serialization with ignored files --- IDE/src/Project.bf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/IDE/src/Project.bf b/IDE/src/Project.bf index da9f1791..15cddccc 100644 --- a/IDE/src/Project.bf +++ b/IDE/src/Project.bf @@ -587,7 +587,7 @@ namespace IDE if (mParentFolder != null) { - data.Add("Type", (mIncludeKind == .Ignore) ? "IgnoreFolder" : "Folder"); + data.Add("Type", (mIncludeKind == .Ignore) ? "IgnoreFolder" : (mIncludeKind == .Auto) ? "AutoFolder" : "Folder"); base.Serialize(data); if (mAutoInclude != (mIncludeKind == .Auto)) data.ConditionalAdd("AutoInclude", mAutoInclude, mIncludeKind == .Auto); @@ -672,6 +672,11 @@ namespace IDE projectItem = new ProjectFolder(); projectItem.mIncludeKind = .Manual; } + else if (type == "AutoFolder") + { + projectItem = new ProjectFolder(); + projectItem.mIncludeKind = .Auto; + } else if (type == "IgnoreFolder") { projectItem = new ProjectFolder(); @@ -727,7 +732,7 @@ namespace IDE String fileName = scope String(); fileEntry.GetFileName(fileName); - if (!gApp.IsFilteredOut(fileName)) + if ((!gApp.IsFilteredOut(fileName)) && (!mChildMap.ContainsKey(fileName))) { let projectItem = new ProjectSource(); projectItem.mProject = mProject;