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) if (mWantsRemoveOldData)
{ {
mBfSystem.RemoveOldParsers();
mBfSystem.RemoveOldData(); mBfSystem.RemoveOldData();
mWantsRemoveOldData = false; mWantsRemoveOldData = false;
} }

11
IDE/src/IDEApp.bf
View file

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

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

@ -563,7 +563,9 @@ namespace IDE.ui
Debug.WriteLine("DoAutoComplete ignored"); Debug.WriteLine("DoAutoComplete ignored");
return; return;
}*/ }*/
if (ResolveCompiler == null)
return;
if (ResolveCompiler.mThreadWorkerHi.mThreadRunning) if (ResolveCompiler.mThreadWorkerHi.mThreadRunning)
{ {
@ -6173,7 +6175,7 @@ namespace IDE.ui
var symbolReferenceHelper = IDEApp.sApp.mSymbolReferenceHelper; var symbolReferenceHelper = IDEApp.sApp.mSymbolReferenceHelper;
if (symbolReferenceHelper == null) if (symbolReferenceHelper == null)
{ {
if (!compiler.mThreadWorkerHi.mThreadRunning) if ((compiler != null) && (!compiler.mThreadWorkerHi.mThreadRunning))
{ {
ShowSymbolReferenceHelper(SymbolReferenceHelper.Kind.ShowFileReferences); ShowSymbolReferenceHelper(SymbolReferenceHelper.Kind.ShowFileReferences);
} }
@ -6199,7 +6201,7 @@ namespace IDE.ui
mWantsCurrentLocation = true; mWantsCurrentLocation = true;
} }
if ((mWantsCurrentLocation) && (!compiler.mThreadWorkerHi.mThreadRunning)) if ((mWantsCurrentLocation) && (compiler != null) && (!compiler.mThreadWorkerHi.mThreadRunning))
{ {
bool canClassify = true; bool canClassify = true;
#if IDE_C_SUPPORT #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); DoAutoComplete(mQueuedAutoComplete.mKeyChar, mQueuedAutoComplete.mOptions);
DeleteAndNullify!(mQueuedAutoComplete); DeleteAndNullify!(mQueuedAutoComplete);