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

Support for matching interface conformance in distinct build options

Browse source
This commit is contained in:
Brian Fiete 2020-09-16 04:37:28 -07:00
parent 6cb1235fd6
commit 0b20ef867b
6 changed files with 87 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDE/src/ui/BuildPropertiesDialog.bf
View file

@ -267,10 +267,20 @@ namespace IDE.ui
else
{
bool isValid = true;
for (let typeName in typeNames.Split(';'))
for (var typeName in typeNames.Split(';'))
{
if ((!typeNames.StartsWith("@")) && (!gApp.mBfResolveCompiler.VerifyTypeName(scope String(typeName), -1)))
isValid = false;
if (!typeNames.StartsWith("@"))
{
while (!typeName.IsEmpty)
{
if ((typeName[0] != ':') && (!typeName[0].IsWhiteSpace))
break;
typeName.RemoveFromStart(1);
}
if (!gApp.mBfResolveCompiler.VerifyTypeName(scope String(typeName), -1))
isValid = false;
}
}
subItem.mTextColor = isValid ? 0xFFFFFFFF : 0xFFFF8080;
propEntry.mColorOverride = subItem.mTextColor;

23
IDE/src/ui/TypeWildcardEditWidget.bf
View file

@ -34,6 +34,14 @@ namespace IDE.ui
editOffset = semiPos + 1;
}
while (editOffset < editText.Length)
{
char8 c = editText[editOffset];
if ((c != ':') && (!c.IsWhiteSpace))
break;
editOffset++;
}
editText.Remove(0, editOffset);
cursorPos -= editOffset;
//
@ -47,7 +55,9 @@ namespace IDE.ui
if (editText.StartsWith("@"))
isValid = true;
else
{
isValid = gApp.mBfResolveCompiler.VerifyTypeName(editText, cursorPos);
}
for (int ofs < editText.Length)
{
@ -82,14 +92,23 @@ namespace IDE.ui
text[i].mDisplayTypeId = 0;
}
for (let typeName in editText.Split(';'))
for (var typeName in editText.Split(';'))
{
int startOfs = 0;
while (!typeName.IsEmpty)
{
if ((typeName[0] != ':') && (!typeName[0].IsWhiteSpace))
break;
typeName.RemoveFromStart(1);
startOfs++;
}
bool isValid = gApp.mBfResolveCompiler.VerifyTypeName(scope String(typeName), -1);
if (!isValid)
{
for (int ofs < typeName.Length)
{
text[@typeName.Pos + ofs].mDisplayTypeId = 1;
text[@typeName.Pos + startOfs + ofs].mDisplayTypeId = 1;
}
}
}