From 75afbd4a3ee56ac767ae5512abf758aa46869119 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Thu, 6 Feb 2020 16:45:53 -0800
Subject: [PATCH] Fixed formatting for enums

---
 IDEHelper/Compiler/BfPrinter.cpp | 34 +++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/IDEHelper/Compiler/BfPrinter.cpp b/IDEHelper/Compiler/BfPrinter.cpp
index da7539c0..eab8bc98 100644
--- a/IDEHelper/Compiler/BfPrinter.cpp
+++ b/IDEHelper/Compiler/BfPrinter.cpp
@@ -2159,7 +2159,15 @@ void BfPrinter::Visit(BfFieldDeclaration* fieldDeclaration)
 		return;
 	}
 
-	ExpectNewLine();
+	bool isEnumDecl = false;
+
+	if (auto enumEntry = BfNodeDynCast<BfEnumEntryDeclaration>(fieldDeclaration))
+	{		
+		isEnumDecl = true;
+	}
+
+	if (!isEnumDecl)
+		ExpectNewLine();
 	if (fieldDeclaration->mAttributes != NULL)
 	{
 		QueueVisitChild(fieldDeclaration->mAttributes);
@@ -2180,14 +2188,22 @@ void BfPrinter::Visit(BfFieldDeclaration* fieldDeclaration)
 	QueueVisitChild(fieldDeclaration->mStaticSpecifier);
 	ExpectSpace();
 	QueueVisitChild(fieldDeclaration->mPrecedingComma);
-	ExpectSpace();	
+	ExpectSpace();
+	if (isEnumDecl)
+		mNextStateModify.mExpectingSpace = false;
 	QueueVisitChild(fieldDeclaration->mTypeRef);
 	ExpectSpace();	
 	QueueVisitChild(fieldDeclaration->mNameNode);
-	ExpectSpace();
-	QueueVisitChild(fieldDeclaration->mEqualsNode);
-	ExpectSpace();
-	QueueVisitChild(fieldDeclaration->mInitializer);
+	if (fieldDeclaration->mEqualsNode != NULL)
+	{
+		ExpectSpace();
+		QueueVisitChild(fieldDeclaration->mEqualsNode);
+	}
+	if (fieldDeclaration->mInitializer != NULL)
+	{
+		ExpectSpace();
+		QueueVisitChild(fieldDeclaration->mInitializer);
+	}
 
 	auto fieldDtor = fieldDeclaration->mFieldDtor;
 	while (fieldDtor != NULL)
@@ -2205,7 +2221,9 @@ void BfPrinter::Visit(BfFieldDeclaration* fieldDeclaration)
 
 void BfPrinter::Visit(BfEnumCaseDeclaration* enumCaseDeclaration)
 {
-	Visit(enumCaseDeclaration->ToBase());
+	ExpectNewLine();
+
+	Visit(enumCaseDeclaration->ToBase());	
 
 	if (mDocPrep)
 	{
@@ -2368,6 +2386,8 @@ void BfPrinter::Visit(BfTypeDeclaration* typeDeclaration)
 			for (auto member : defineBlock->mChildArr)
 			{
 				SetAndRestoreValue<BfAstNode*> prevBlockMember(mCurBlockMember, member);
+				if (auto fieldDecl = BfNodeDynCast<BfFieldDeclaration>(member))
+					ExpectNewLine();
 				VisitChild(member);
 			}
 			ExpectUnindent();