Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-27 03:58:01 +02:00
Code Activity

Added a RefType colorization type

Browse source
This commit is contained in:
Brian Fiete 2020-08-13 06:28:31 -07:00
parent 09e6564b3e
commit 9bbcb8eb5e
9 changed files with 130 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDE/src/IDEUtils.bf
View file

@ -432,7 +432,7 @@ namespace IDE
inSubtype ? (int32)SourceElementType.TypeRef : (int32)SourceElementType.Namespace
];*/
uint32 color = SourceEditWidgetContent.sTextColors[(int32)SourceElementType.TypeRef];
uint32 color = SourceEditWidgetContent.sTextColors[(int32)SourceElementType.Type];
/*if ((c == '+') || (c == '('))
{

43
IDE/src/Settings.bf
View file

@ -276,10 +276,10 @@ namespace IDE
public Color mKeyword = 0xFFE1AE9A;
public Color mLiteral = 0XFFC8A0FF;
public Color mIdentifier = 0xFFFFFFFF;
public Color mType = 0XFF66D9EF;
public Color mComment = 0XFF75715E;
public Color mMethod = 0XFFA6E22A;
public Color mTypeRef = 0XFF66D9EF;
public Color mType = 0XFF66D9EF;
public Color mRefType = 0XFF66D9EF;
public Color mNamespace = 0xFF7BEEB7;
public Color mDisassemblyText = 0xFFB0B0B0;
public Color mDisassemblyFileName = 0XFFFF0000;
@ -309,10 +309,15 @@ namespace IDE
GetColor("Keyword", ref mKeyword);
GetColor("Literal", ref mLiteral);
GetColor("Identifier", ref mIdentifier);
GetColor("Type", ref mType);
GetColor("Comment", ref mComment);
GetColor("Method", ref mMethod);
GetColor("TypeRef", ref mTypeRef);
if (sd.Contains("Type"))
{
GetColor("Type", ref mType);
if (!sd.Contains("RefType"))
mRefType = mType;
}
GetColor("RefType", ref mRefType);
GetColor("Namespace", ref mNamespace);
GetColor("DisassemblyText", ref mDisassemblyText);
GetColor("DisassemblyFileName", ref mDisassemblyFileName);
@ -324,21 +329,21 @@ namespace IDE
public void Apply()
{
SourceEditWidgetContent.sTextColors[0] = mCode;
SourceEditWidgetContent.sTextColors[1] = mKeyword;
SourceEditWidgetContent.sTextColors[2] = mLiteral;
SourceEditWidgetContent.sTextColors[3] = mIdentifier;
SourceEditWidgetContent.sTextColors[4] = mType;
SourceEditWidgetContent.sTextColors[5] = mComment;
SourceEditWidgetContent.sTextColors[6] = mMethod;
SourceEditWidgetContent.sTextColors[7] = mTypeRef;
SourceEditWidgetContent.sTextColors[8] = mNamespace;
SourceEditWidgetContent.sTextColors[9] = mDisassemblyText;
SourceEditWidgetContent.sTextColors[10] = mDisassemblyFileName;
SourceEditWidgetContent.sTextColors[11] = mError;
SourceEditWidgetContent.sTextColors[12] = mBuildError;
SourceEditWidgetContent.sTextColors[13] = mBuildWarning;
SourceEditWidgetContent.sTextColors[14] = mVisibleWhiteSpace;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Normal] = mCode;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Keyword] = mKeyword;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Literal] = mLiteral;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Identifier] = mIdentifier;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Comment] = mComment;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Method] = mMethod;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Type] = mType;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.RefType] = mRefType;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Namespace] = mNamespace;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Disassembly_Text] = mDisassemblyText;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Disassembly_FileName] = mDisassemblyFileName;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.Error] = mError;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.BuildError] = mBuildError;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.BuildWarning] = mBuildWarning;
SourceEditWidgetContent.sTextColors[(.)SourceElementType.VisibleWhiteSpace] = mVisibleWhiteSpace;
DarkTheme.COLOR_TEXT = mText;
DarkTheme.COLOR_WINDOW = mWindow;

12
IDE/src/ui/SourceEditWidgetContent.bf
View file

@ -199,10 +199,10 @@ namespace IDE.ui
0xFFE1AE9A, // Keyword
0XFFC8A0FF, // Literal
0xFFFFFFFF, // Identifier
0XFF66D9EF, // Type
0XFF75715E, // Comment
0XFFA6E22A, // Method
0XFF66D9EF, // TypeRef
0xFF75715E, // Comment
0xFFA6E22A, // Method
0xFF66D9EF, // Type
0xFF66D9EF, // RefType
0xFF7BEEB7, // Namespace
0xFFB0B0B0, // Disassembly_Text
@ -966,7 +966,7 @@ namespace IDE.ui
if (!prevC.IsWhiteSpace)
{
var prevElementType = (SourceElementType)mData.mText[checkIdx - 1].mDisplayTypeId;
startedWithType = prevElementType == SourceElementType.TypeRef;
startedWithType = (prevElementType == SourceElementType.Type) || (prevElementType == SourceElementType.RefType);
checkedStartedWithType = true;
}
}
@ -974,7 +974,7 @@ namespace IDE.ui
if ((elementType == SourceElementType.Comment) || (isWhitespace))
continue;
if ((!checkedStartedWithType) && (elementType != SourceElementType.Namespace) && (elementType != SourceElementType.TypeRef))
if ((!checkedStartedWithType) && (elementType != SourceElementType.Namespace) && (elementType != SourceElementType.Type) && (elementType != SourceElementType.RefType))
{
checkedStartedWithType = true;
}

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

@ -27,10 +27,10 @@ namespace IDE.ui
Keyword,
Literal,
Identifier,
Type,
Comment,
Method,
TypeRef,
Type,
RefType,
Namespace,
Disassembly_Text,
@ -4273,7 +4273,7 @@ namespace IDE.ui
// Autocomplete beat us to it
destText[destIdx].mDisplayPassId = (uint8)SourceDisplayId.Cleared;
}
else if (charData[srcIdx].mDisplayTypeId == (uint8)SourceDisplayId.SkipResult)
else if (charData[srcIdx].mDisplayPassId == (uint8)SourceDisplayId.SkipResult)
{
//
}