Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Fixed multi-project deletion, adding project with implicitly-loaded deps

Browse source
This commit is contained in:
Brian Fiete 2020-09-06 06:14:39 -07:00
parent 0eea8eeef6
commit a62a995472
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDE/src/Compiler/BfCompiler.bf
View file

@ -366,7 +366,9 @@ namespace IDE.Compiler
if (command is SetupProjectSettingsCommand)
{
var setupProjectSettingsCommand = (SetupProjectSettingsCommand)command;
var setupProjectSettingsCommand = (SetupProjectSettingsCommand)command;
if (setupProjectSettingsCommand.mProject.mDeleted)
continue;
gApp.SetupBeefProjectSettings(mBfSystem, this, setupProjectSettingsCommand.mProject);
}
@ -381,6 +383,8 @@ namespace IDE.Compiler
ProjectSourceCommandBlock:
{
var projectSourceCommand = (ProjectSourceCommand)command;
if (projectSourceCommand.mProjectSource.mProject.mDeleted)
continue;
bool worked = true;
String sourceFilePath = scope String();
var projectSource = projectSourceCommand.mProjectSource;

1
IDE/src/Project.bf
View file

@ -1257,6 +1257,7 @@ namespace IDE
public bool mEnabled = true;
public bool mLocked;
public bool mLockedDefault;
public bool mDeleted;
public int32 [] mColorDialogCustomColors;

1
IDE/src/Workspace.bf
View file

@ -386,6 +386,7 @@ namespace IDE
public List<ProjectSpec> mProjectSpecs = new .() ~ DeleteContainerAndItems!(_);
public Dictionary<String, Project> mProjectNameMap = new .() ~ DeleteDictionaryAndKeys!(_);
public Project mStartupProject;
public bool mLoading;
public bool mNeedsCreate;
public bool mHasChanged;
public bool mHadHotCompileSinceLastFullCompile;

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

@ -1854,7 +1854,7 @@ namespace IDE.ui
return null;
}
bool failed = false;
bool failed = false;
String projName = scope String();
Path.GetFileNameWithoutExtension(filePath, projName);
if (gApp.mWorkspace.FindProject(projName) != null)
@ -1871,8 +1871,9 @@ namespace IDE.ui
IDEUtils.FixFilePath(projFilePath);
proj.mProjectPath.Set(projFilePath);
proj.Load(projFilePath);
IDEApp.sApp.AddNewProjectToWorkspace(proj, verSpec);
IDEApp.sApp.mWorkspace.FixOptions();
gApp.AddNewProjectToWorkspace(proj, verSpec);
gApp.mWorkspace.FixOptions();
gApp.[Friend]FlushDeferredLoadProjects(true);
InitProject(proj);
if (failed)
{