Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 22:34:09 +02:00
Code Activity

Fixed manually added files with same name as auto files in IDE

Browse source
This commit is contained in:
Brian Fiete 2020-01-23 07:43:44 -08:00
parent d59f79ef79
commit 480f909cec
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
IDE/src/Project.bf
View file

@ -37,6 +37,14 @@ namespace IDE
public String mName = new String() ~ delete _;
public String mComment = new String() ~ delete _;
public bool IncludeInMap
{
get
{
return mIncludeKind != .Manual;
}
}
public ~this()
{
Debug.Assert(mRefCount == 0);
@ -236,9 +244,12 @@ namespace IDE
bool didNameMatch = mName == fileName;
mParentFolder.mChildMap.Remove(mName);
mName.Set(newName);
mParentFolder.mChildMap.Add(mName, this);
if (IncludeInMap)
{
mParentFolder.mChildMap.Remove(mName);
mName.Set(newName);
mParentFolder.mChildMap.Add(mName, this);
}
if ((didNameMatch) && (changePath))
{
@ -480,8 +491,12 @@ namespace IDE
}
mChildItems.Insert(index, item);
bool added = mChildMap.TryAdd(item.mName, item);
Debug.Assert(added);
if (item.IncludeInMap)
{
bool added = mChildMap.TryAdd(item.mName, item);
Debug.Assert(added);
}
}
public virtual void InsertChild(ProjectItem item, ProjectItem insertBefore)
@ -505,7 +520,8 @@ namespace IDE
projectFileItem.StopWatching();
}
mChildMap.Remove(item.mName);
if (item.IncludeInMap)
mChildMap.Remove(item.mName);
mChildItems.Remove(item);
item.mParentFolder = null;
}