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

Added ability to specify fail text

Browse source
This commit is contained in:
Brian Fiete 2020-06-21 07:51:01 -07:00
parent 307c1080c4
commit 5851653a19
1 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

47
IDE/src/ScriptManager.bf
View file

@ -10,6 +10,7 @@ using IDE.Debugger;
using Beefy.theme.dark; using Beefy.theme.dark;
using System.Threading; using System.Threading;
using System.Security.Cryptography; using System.Security.Cryptography;
using IDE.Compiler;
namespace IDE namespace IDE
{ {
@ -2342,6 +2343,29 @@ namespace IDE
mScriptManager.Fail("No active text panel"); mScriptManager.Fail("No active text panel");
return; return;
} }
List<BfPassInstance.BfError> errorList = scope .();
bool hasErrors = false;
BfPassInstance.BfError FindError(int line)
{
if (!hasErrors)
{
for (var error in gApp.mErrorsPanel.mResolveErrors)
{
if (error.mFilePath == textPanel.mFilePath)
{
errorList.Add(error);
errorList.Sort(scope (lhs, rhs) => lhs.mLine - rhs.mLine);
}
}
}
int idx = errorList.BinarySearchAlt(line, scope (lhs, rhs) => lhs.mLine - line);
if (idx >= 0)
return errorList[idx];
return null;
}
var ewc = textPanel.EditWidget.mEditWidgetContent; var ewc = textPanel.EditWidget.mEditWidgetContent;
String lineText = scope String(); String lineText = scope String();
@ -2359,8 +2383,27 @@ namespace IDE
hasError = true; hasError = true;
} }
bool expectedError = lineText.Contains("//FAIL"); int failIdx = lineText.IndexOf("//FAIL");
if (hasError != expectedError) bool expectedError = failIdx != -1;
if (hasError == expectedError)
{
if (expectedError)
{
String wantsError = scope String(lineText, failIdx + "//FAIL".Length);
wantsError.Trim();
if (!wantsError.IsEmpty)
{
bool foundErrorText = false;
if (var error = FindError(lineIdx))
foundErrorText = error.mError.Contains(wantsError);
if (!foundErrorText)
{
mScriptManager.Fail("Error at line {0} in {1} did not contain error text '{}'\n\t", lineIdx + 1, textPanel.mFilePath, wantsError);
}
}
}
}
else
{ {
if (hasError) if (hasError)
mScriptManager.Fail("Unexpected error at line {0} in {1}\n\t", lineIdx + 1, textPanel.mFilePath); mScriptManager.Fail("Unexpected error at line {0} in {1}\n\t", lineIdx + 1, textPanel.mFilePath);