Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-16 07:14: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

10
IDE/src/ui/ProjectPanel.bf
View file

@ -1103,7 +1103,7 @@ namespace IDE.ui
app.RemoveProject(project);
}
void ProjectItemUnregister(ProjectItem projectItem, bool isDeleting)
void ProjectItemUnregister(ProjectItem projectItem, bool isRemovingProjectSource)
{
var projectSource = projectItem as ProjectSource;
if (projectSource != null)
@ -1136,7 +1136,7 @@ namespace IDE.ui
var sourceViewPanel = tab.mContent as SourceViewPanel;
if ((sourceViewPanel != null) && (sourceViewPanel.mProjectSource == projectSource))
{
if (isDeleting)
if (isRemovingProjectSource)
sourceViewPanel.DetachFromProjectItem();
else
sourceViewPanel.QueueFullRefresh(true);
@ -1145,7 +1145,7 @@ namespace IDE.ui
if (isProjectEnabled)
{
if (isDeleting)
if (isRemovingProjectSource)
{
gApp.mBfResolveHelper.ProjectSourceRemoved(projectSource);
gApp.mWorkspace.ProjectSourceRemoved(projectSource);
@ -1198,8 +1198,6 @@ namespace IDE.ui
if (projectItem == null)
return;
ProjectItemUnregister(projectItem, forceRemove);
bool doReleaseRef = false;
bool didRemove = false;
if ((forceRemove) || (projectItem.mParentFolder == null) || (projectItem.mParentFolder.mIncludeKind == .Manual) || (projectItem.mIncludeKind == .Manual) || (deletePathFunc != null))
@ -1252,6 +1250,8 @@ namespace IDE.ui
}
}
ProjectItemUnregister(projectItem, didRemove);
if ((didRemove) || (!mShowIgnored))
{
listItem.mParentItem.RemoveChildItem(listItem);

2
IDE/src/ui/WatchPanel.bf
View file

@ -297,7 +297,7 @@ namespace IDE.ui
{
scope AutoBeefPerf("ExpressionEditWidget.UpdateText");
if (keyChar == 0)
if ((keyChar == 0) && (doAutoComplete))
return; // Is documentation pass
DeleteAndNullify!(mLastError);