Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-06 16:25:59 +02:00
Code Activity

Improvements to auto-impl properties

Browse source
This commit is contained in:
Brian Fiete 2022-03-01 09:49:02 -08:00
parent 36e0a3a375
commit 06f4eb9576
8 changed files with 113 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDE/Tests/CompileFail001/src/Declarations.bf
View file

@ -1,3 +1,5 @@
#pragma warning disable 168
using System;
namespace IDETest
{
@ -49,7 +51,7 @@ namespace IDETest
{
parent = test;
mInnerInt = parent.mA;
mSA.mA = 123;
int a = mSA.mA;
int b = mSA.mB; //FAIL

4
IDE/Tests/CompileFail001/src/Properties.bf
View file

@ -19,6 +19,9 @@ namespace IDETest
struct StructB
{
public StructA B { get; }
public StructA B2 { get; set mut; }
public ref StructA B3 { get; } //FAIL
public ref StructA B4 { get mut; }
int mZ = 9;
@ -29,6 +32,7 @@ namespace IDETest
public void Yoop() mut
{
B = .(); //FAIL
B2.mA = .(); //WARN
}
}
}

77
IDE/src/ScriptManager.bf
View file

@ -2428,51 +2428,62 @@ namespace IDE
ewc.GetLineText(lineIdx, lineText);
ewc.GetLinePosition(lineIdx, var lineStart, var lineEnd);
bool hasError = false;
for (int i = lineStart; i < lineEnd; i++)
void FindError(bool warning)
{
var flags = (SourceElementFlags)ewc.mData.mText[i].mDisplayFlags;
if (flags.HasFlag(.Error))
hasError = true;
}
int failIdx = lineText.IndexOf("//FAIL");
bool expectedError = failIdx != -1;
if (hasError == expectedError)
{
if (expectedError)
bool hasError = false;
for (int i = lineStart; i < lineEnd; i++)
{
String wantsError = scope String(lineText, failIdx + "//FAIL".Length);
wantsError.Trim();
if (!wantsError.IsEmpty)
var flags = (SourceElementFlags)ewc.mData.mText[i].mDisplayFlags;
if (flags.HasFlag(warning ? .Warning : .Error))
hasError = true;
}
String kind = warning ? "warning" : "error";
int failIdx = lineText.IndexOf(warning ? "//WARN" : "//FAIL");
bool expectedError = failIdx != -1;
if (hasError == expectedError)
{
if (expectedError)
{
bool foundErrorText = false;
if (var error = FindError(lineIdx))
String wantsError = scope String(lineText, failIdx + "//FAIL".Length);
wantsError.Trim();
if (!wantsError.IsEmpty)
{
if (error.mError.Contains(wantsError))
foundErrorText = true;
if (error.mMoreInfo != null)
bool foundErrorText = false;
if (var error = FindError(lineIdx))
{
for (var moreInfo in error.mMoreInfo)
if (moreInfo.mError.Contains(wantsError))
if (error.mIsWarning == warning)
{
if (error.mError.Contains(wantsError))
foundErrorText = true;
if (error.mMoreInfo != null)
{
for (var moreInfo in error.mMoreInfo)
if (moreInfo.mError.Contains(wantsError))
foundErrorText = true;
}
}
}
if (!foundErrorText)
{
mScriptManager.Fail($"Line {lineIdx + 1} {kind} in {textPanel.mFilePath} did not contain {kind} text '{wantsError}'\n\t");
}
}
if (!foundErrorText)
{
mScriptManager.Fail("Error at line {0} in {1} did not contain error text '{2}'\n\t", lineIdx + 1, textPanel.mFilePath, wantsError);
}
}
}
}
else
{
if (hasError)
mScriptManager.Fail("Unexpected error at line {0} in {1}\n\t", lineIdx + 1, textPanel.mFilePath);
else
mScriptManager.Fail("Expected error but didn't encounter one at line {0} in {1}\n\t", lineIdx + 1, textPanel.mFilePath);
return;
{
if (hasError)
mScriptManager.Fail($"Unexpected {kind} at line {lineIdx + 1} in {textPanel.mFilePath}\n\t");
else
mScriptManager.Fail($"Expected {kind} but didn't encounter one at line {lineIdx + 1} in {textPanel.mFilePath}\n\t");
return;
}
}
FindError(false);
FindError(true);
}
}