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

Made some fixes for not having a resolve compiler enabled

Browse source
This commit is contained in:
Brian Fiete 2020-05-19 09:09:18 -07:00
parent e5e40811cf
commit 4fe6bcaa86
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -752,6 +752,7 @@ namespace IDE.Compiler
{
if (mWantsRemoveOldData)
{
mBfSystem.RemoveOldParsers();
mBfSystem.RemoveOldData();
mWantsRemoveOldData = false;
}

5
IDE/src/IDEApp.bf
View file

@ -546,7 +546,9 @@ namespace IDE
public void GetBfCompilers(List<BfCompiler> compiler)
{
if (mBfBuildCompiler != null)
compiler.Add(mBfBuildCompiler);
if (mBfResolveCompiler != null)
compiler.Add(mBfResolveCompiler);
}
@ -2676,6 +2678,7 @@ namespace IDE
mWorkspace.FixOptions(mConfigName, mPlatformName);
#if !CLI
if (mBfResolveSystem != null)
PreConfigureBeefSystem(mBfResolveSystem, mBfResolveCompiler);
#endif
for (var project in mWorkspace.mProjects)
@ -11124,7 +11127,7 @@ namespace IDE
if (projectSource != null)
{
var resolveCompiler = GetProjectCompilerForFile(projectSource.mPath);
if (resolveCompiler == mBfResolveCompiler)
if ((resolveCompiler == mBfResolveCompiler) && (resolveCompiler != null))
resolveCompiler.QueueProjectSourceRemoved(projectSource);
if (IsBeefFile(projectSource.mPath))

8
IDE/src/ui/SourceViewPanel.bf
View file

@ -564,6 +564,8 @@ namespace IDE.ui
return;
}*/
if (ResolveCompiler == null)
return;
if (ResolveCompiler.mThreadWorkerHi.mThreadRunning)
{
@ -6173,7 +6175,7 @@ namespace IDE.ui
var symbolReferenceHelper = IDEApp.sApp.mSymbolReferenceHelper;
if (symbolReferenceHelper == null)
{
if (!compiler.mThreadWorkerHi.mThreadRunning)
if ((compiler != null) && (!compiler.mThreadWorkerHi.mThreadRunning))
{
ShowSymbolReferenceHelper(SymbolReferenceHelper.Kind.ShowFileReferences);
}
@ -6199,7 +6201,7 @@ namespace IDE.ui
mWantsCurrentLocation = true;
}
if ((mWantsCurrentLocation) && (!compiler.mThreadWorkerHi.mThreadRunning))
if ((mWantsCurrentLocation) && (compiler != null) && (!compiler.mThreadWorkerHi.mThreadRunning))
{
bool canClassify = true;
#if IDE_C_SUPPORT
@ -6221,7 +6223,7 @@ namespace IDE.ui
}
}
if ((mQueuedAutoComplete != null) & (!compiler.mThreadWorkerHi.mThreadRunning))
if ((mQueuedAutoComplete != null) & (compiler != null) && (!compiler.mThreadWorkerHi.mThreadRunning))
{
DoAutoComplete(mQueuedAutoComplete.mKeyChar, mQueuedAutoComplete.mOptions);
DeleteAndNullify!(mQueuedAutoComplete);