修改父指针为引用

CppCXY · CppCXY · commit a4af2ae611c6 · 2021-10-30T23:41:44.000+08:00
diff --git a/CodeService/src/FormatElement/AlignToFirstElement.cpp b/CodeService/src/FormatElement/AlignToFirstElement.cpp
@@ -10,7 +10,7 @@ FormatElementType AlignToFirstElement::GetType()
 	return FormatElementType::AlignToFirstElement;
 }
 
-void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	for (int i = 0; i != _children.size(); i++)
 	{
@@ -37,7 +37,7 @@ void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElem
 			}
 		}
 
-		_children[i]->Serialize(ctx, i, this);
+		_children[i]->Serialize(ctx, i, *this);
 
 		if(i == _children.size() - 1)
 		{
diff --git a/CodeService/src/FormatElement/AlignmentElement.cpp b/CodeService/src/FormatElement/AlignmentElement.cpp
@@ -11,7 +11,7 @@ FormatElementType AlignmentElement::GetType()
 	return FormatElementType::AlignmentElement;
 }
 
-void AlignmentElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void AlignmentElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	int blank = _alignmentPosition - ctx.GetCharacterCount();
 	if (blank > 0)
diff --git a/CodeService/src/FormatElement/AlignmentLayoutElement.cpp b/CodeService/src/FormatElement/AlignmentLayoutElement.cpp
@@ -21,7 +21,7 @@ FormatElementType AlignmentLayoutElement::GetType()
 	return FormatElementType::AlignmentLayoutElement;
 }
 
-void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	int eqAlignedPosition = 0;
 	bool firstContainEq = true;
@@ -49,15 +49,15 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatE
 						auto lastValidIndex = FindLastValidChildIndex(index, statChildren);
 						if (lastValidIndex == -1)
 						{
-							return normalSerialize(ctx, position, this);
+							return normalSerialize(ctx, position, *this);
 						}
 						auto lastStatChild = statChildren[lastValidIndex];
 						auto lastPosition = ctx.GetColumn(lastStatChild->GetTextRange().EndOffset);
 
 
 						if (eqPosition - lastPosition <= 2)
 						{
-							return normalSerialize(ctx, position, this);
+							return normalSerialize(ctx, position, *this);
 						}
 					}
 
@@ -70,10 +70,10 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatE
 		}
 	}
 
-	return alignmentSerialize(ctx, position, this, eqAlignedPosition);
+	return alignmentSerialize(ctx, position, *this, eqAlignedPosition);
 }
 
-void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position, FormatElement* parent, int eqPosition)
+void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position, FormatElement& parent, int eqPosition)
 {
 	for (auto statChild : _children)
 	{
@@ -98,7 +98,7 @@ void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position
 	return normalSerialize(ctx, position, parent);
 }
 
-void AlignmentLayoutElement::normalSerialize(FormatContext& ctx, int position, FormatElement* parent)
+void AlignmentLayoutElement::normalSerialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	FormatElement::Serialize(ctx, position, parent);
 }
diff --git a/CodeService/src/FormatElement/FormatElement.cpp b/CodeService/src/FormatElement/FormatElement.cpp
@@ -56,17 +56,17 @@ std::shared_ptr<FormatElement> FormatElement::LastValidElement() const
 	return nullptr;
 }
 
-void FormatElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void FormatElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	for (std::size_t i = 0; i != _children.size(); i++)
 	{
-		_children[i]->Serialize(ctx, i, this);
+		_children[i]->Serialize(ctx, i, *this);
 	}
 }
 
 void FormatElement::Format(FormatContext& ctx)
 {
-	return Serialize(ctx, 0, nullptr);
+	return Serialize(ctx, 0, *this);
 }
 
 void FormatElement::AddTextRange(TextRange range)
diff --git a/CodeService/src/FormatElement/IndentElement.cpp b/CodeService/src/FormatElement/IndentElement.cpp
@@ -11,7 +11,7 @@ FormatElementType IndentElement::GetType()
 	return FormatElementType::IndentElement;
 }
 
-void IndentElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void IndentElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	ctx.AddIndent(_specialIndent);
 
diff --git a/CodeService/src/FormatElement/KeepBlankElement.cpp b/CodeService/src/FormatElement/KeepBlankElement.cpp
@@ -11,7 +11,7 @@ FormatElementType KeepBlankElement::GetType()
 	return FormatElementType::KeepBlankElement;
 }
 
-void KeepBlankElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void KeepBlankElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	ctx.PrintBlank(_blank);
 }
diff --git a/CodeService/src/FormatElement/KeepElement.cpp b/CodeService/src/FormatElement/KeepElement.cpp
@@ -12,7 +12,7 @@ FormatElementType KeepElement::GetType()
 	return FormatElementType::KeepElement;
 }
 
-void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	int lastElementLine = getLastValidLine(ctx, position, parent);
 	int nextElementLine = getNextValidLine(ctx, position, parent);
diff --git a/CodeService/src/FormatElement/KeepLineElement.cpp b/CodeService/src/FormatElement/KeepLineElement.cpp
@@ -12,7 +12,7 @@ FormatElementType KeepLineElement::GetType()
 	return FormatElementType::KeepLineElement;
 }
 
-void KeepLineElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void KeepLineElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	int line = _line;
 	if (_line == -1)
@@ -35,9 +35,9 @@ void KeepLineElement::Serialize(FormatContext& ctx, int position, FormatElement*
 	ctx.PrintLine(line);
 }
 
-int KeepLineElement::getLastValidLine(FormatContext& ctx, int position, FormatElement* parent)
+int KeepLineElement::getLastValidLine(FormatContext& ctx, int position, FormatElement& parent)
 {
-	auto& siblings = parent->GetChildren();
+	auto& siblings = parent.GetChildren();
 	for (int index = position - 1; index >= 0; index--)
 	{
 		if(siblings[index]->HasValidTextRange())
@@ -47,12 +47,12 @@ int KeepLineElement::getLastValidLine(FormatContext& ctx, int position, FormatEl
 	}
 
 	// ��ôһ���������Ҳ�����Ч��ΧԪ��
-	return ctx.GetLine(parent->GetTextRange().StartOffset);
+	return ctx.GetLine(parent.GetTextRange().StartOffset);
 }
 
-int KeepLineElement::getNextValidLine(FormatContext& ctx, int position, FormatElement* parent)
+int KeepLineElement::getNextValidLine(FormatContext& ctx, int position, FormatElement& parent)
 {
-	auto& siblings = parent->GetChildren();
+	auto& siblings = parent.GetChildren();
 	for (std::size_t index = position + 1; index < siblings.size(); index++)
 	{
 		if (siblings[index]->HasValidTextRange())
diff --git a/CodeService/src/FormatElement/LineElement.cpp b/CodeService/src/FormatElement/LineElement.cpp
@@ -11,7 +11,7 @@ FormatElementType LineElement::GetType()
 	return FormatElementType::LineElement;
 }
 
-void LineElement::Serialize(FormatContext& ctx, int position,FormatElement* parent)
+void LineElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	ctx.PrintLine(1);
 }
diff --git a/CodeService/src/FormatElement/LongExpressionLayoutElement.cpp b/CodeService/src/FormatElement/LongExpressionLayoutElement.cpp
@@ -10,25 +10,25 @@ FormatElementType LongExpressionLayoutElement::GetType()
 	return FormatElementType::LongExpressionLayoutElement;
 }
 
-void LongExpressionLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void LongExpressionLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
-	SerializeSubExpression(ctx, this);
+	SerializeSubExpression(ctx, *this);
 	if (_hasIndent)
 	{
 		ctx.RecoverIndent();
 	}
 }
 
-void LongExpressionLayoutElement::SerializeSubExpression(FormatContext& ctx, FormatElement* parent)
+void LongExpressionLayoutElement::SerializeSubExpression(FormatContext& ctx, FormatElement& parent)
 {
-	auto& children = parent->GetChildren();
+	auto& children = parent.GetChildren();
 	for (std::size_t i = 0; i != children.size(); i++)
 	{
 		auto child = children[i];
 
 		if (child->GetType() == FormatElementType::SubExpressionElement)
 		{
-			SerializeSubExpression(ctx, child.get());
+			SerializeSubExpression(ctx, *child);
 		}
 		else
 		{
diff --git a/CodeService/src/FormatElement/MinLineElement.cpp b/CodeService/src/FormatElement/MinLineElement.cpp
@@ -11,15 +11,15 @@ FormatElementType MinLineElement::GetType()
 	return FormatElementType::MinLineElement;
 }
 
-void MinLineElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void MinLineElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	auto minLine = 0;
 	if (_line > 0)
 	{
 		minLine = _line;
 	}
 
-	auto& siblings = parent->GetChildren();
+	auto& siblings = parent.GetChildren();
 
 	int firstElementLine = 0;
 	int secondElementLine = 0;
diff --git a/CodeService/src/FormatElement/StatementElement.cpp b/CodeService/src/FormatElement/StatementElement.cpp
@@ -5,7 +5,7 @@ FormatElementType StatementElement::GetType()
 	return FormatElementType::StatementElement;
 }
 
-void StatementElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void StatementElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	FormatElement::Serialize(ctx, position, parent);
 
diff --git a/CodeService/src/FormatElement/TextElement.cpp b/CodeService/src/FormatElement/TextElement.cpp
@@ -16,7 +16,7 @@ FormatElementType TextElement::GetType()
 	return FormatElementType::TextElement;
 }
 
-void TextElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)
+void TextElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)
 {
 	ctx.Print(_text);
 }
diff --git a/CodeService/src/LuaFormatter.cpp b/CodeService/src/LuaFormatter.cpp
@@ -53,7 +53,7 @@ std::string LuaFormatter::GetFormattedText()
 	LuaFormatOptions options;
 	FormatContext ctx(_parser, options);
 
-	_env->Serialize(ctx, 0, nullptr);
+	_env->Format(ctx);
 
 	return ctx.GetText();
 }
diff --git a/include/CodeService/FormatElement/AlignToFirstElement.h b/include/CodeService/FormatElement/AlignToFirstElement.h
@@ -9,7 +9,7 @@ class AlignToFirstElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 private:
 	int _lowestIndent;
 };
diff --git a/include/CodeService/FormatElement/AlignmentElement.h b/include/CodeService/FormatElement/AlignmentElement.h
@@ -8,7 +8,7 @@ class AlignmentElement : public FormatElement
 	AlignmentElement(int alignmentPosition);
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 private:
 	int _alignmentPosition;
diff --git a/include/CodeService/FormatElement/AlignmentLayoutElement.h b/include/CodeService/FormatElement/AlignmentLayoutElement.h
@@ -7,9 +7,9 @@ class AlignmentLayoutElement : public FormatElement
 public:
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 private:
-	void alignmentSerialize(FormatContext& ctx, int position, FormatElement* parent, int eqPosition);
-	void normalSerialize(FormatContext& ctx, int position, FormatElement* parent);
+	void alignmentSerialize(FormatContext& ctx, int position, FormatElement& parent, int eqPosition);
+	void normalSerialize(FormatContext& ctx, int position, FormatElement& parent);
 };
diff --git a/include/CodeService/FormatElement/FormatElement.h b/include/CodeService/FormatElement/FormatElement.h
@@ -14,7 +14,7 @@ class FormatElement
 	/*
 	 * 智能指针在多态方面支持不够方便
 	 */
-	virtual void Serialize(FormatContext& ctx, int position, FormatElement* parent);
+	virtual void Serialize(FormatContext& ctx, int position, FormatElement& parent);
 
 	void Format(FormatContext& ctx);
 
diff --git a/include/CodeService/FormatElement/IndentElement.h b/include/CodeService/FormatElement/IndentElement.h
@@ -9,7 +9,7 @@ class IndentElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 private:
 	int _specialIndent;
 };
diff --git a/include/CodeService/FormatElement/KeepBlankElement.h b/include/CodeService/FormatElement/KeepBlankElement.h
@@ -10,7 +10,7 @@ class KeepBlankElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 private:
 	int _blank;
 };
diff --git a/include/CodeService/FormatElement/KeepElement.h b/include/CodeService/FormatElement/KeepElement.h
@@ -13,7 +13,7 @@ class KeepElement : public KeepLineElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 private:
 	int _keepBlank;
 	bool _hasLinebreak;
diff --git a/include/CodeService/FormatElement/KeepLineElement.h b/include/CodeService/FormatElement/KeepLineElement.h
@@ -9,10 +9,10 @@ class KeepLineElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 protected:
-	int getLastValidLine(FormatContext& ctx, int position, FormatElement* parent);
-	int getNextValidLine(FormatContext& ctx, int position, FormatElement* parent);
+	int getLastValidLine(FormatContext& ctx, int position, FormatElement& parent);
+	int getNextValidLine(FormatContext& ctx, int position, FormatElement& parent);
 private:
 	int _line;
 };
diff --git a/include/CodeService/FormatElement/LineElement.h b/include/CodeService/FormatElement/LineElement.h
@@ -9,5 +9,5 @@ class LineElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 };
diff --git a/include/CodeService/FormatElement/LongExpressionLayoutElement.h b/include/CodeService/FormatElement/LongExpressionLayoutElement.h
@@ -9,10 +9,10 @@ class LongExpressionLayoutElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 private:
-	void SerializeSubExpression(FormatContext& ctx, FormatElement* parent);
+	void SerializeSubExpression(FormatContext& ctx, FormatElement& parent);
 
 	bool _hasIndent;
 };
diff --git a/include/CodeService/FormatElement/MinLineElement.h b/include/CodeService/FormatElement/MinLineElement.h
@@ -9,7 +9,7 @@ class MinLineElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 private:
 	int _line;
diff --git a/include/CodeService/FormatElement/StatementElement.h b/include/CodeService/FormatElement/StatementElement.h
@@ -8,6 +8,6 @@ class StatementElement : public FormatElement
 public:
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position, FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 };
diff --git a/include/CodeService/FormatElement/TextElement.h b/include/CodeService/FormatElement/TextElement.h
@@ -12,7 +12,7 @@ class TextElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, int position,FormatElement* parent) override;
+	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
 
 	std::string_view GetText() const;
 private:

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ FormatElementType AlignToFirstElement::GetType()`
`10`	`10`	`return FormatElementType::AlignToFirstElement;`
`11`	`11`	`}`
`12`	`12`
`13`		`-void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`13`	`+void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`14`	`14`	`{`
`15`	`15`	`for (int i = 0; i != _children.size(); i++)`
`16`	`16`	`{`
`@@ -37,7 +37,7 @@ void AlignToFirstElement::Serialize(FormatContext& ctx, int position, FormatElem`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- _children[i]->Serialize(ctx, i, this);`
	`40`	`+ _children[i]->Serialize(ctx, i, *this);`
`41`	`41`
`42`	`42`	`if(i == _children.size() - 1)`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ FormatElementType AlignmentElement::GetType()`
`11`	`11`	`return FormatElementType::AlignmentElement;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void AlignmentElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`14`	`+void AlignmentElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`15`	`15`	`{`
`16`	`16`	`int blank = _alignmentPosition - ctx.GetCharacterCount();`
`17`	`17`	`if (blank > 0)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ FormatElementType AlignmentLayoutElement::GetType()`
`21`	`21`	`return FormatElementType::AlignmentLayoutElement;`
`22`	`22`	`}`
`23`	`23`
`24`		`-void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`24`	`+void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`25`	`25`	`{`
`26`	`26`	`int eqAlignedPosition = 0;`
`27`	`27`	`bool firstContainEq = true;`
`@@ -49,15 +49,15 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatE`
`49`	`49`	`auto lastValidIndex = FindLastValidChildIndex(index, statChildren);`
`50`	`50`	`if (lastValidIndex == -1)`
`51`	`51`	`{`
`52`		`- return normalSerialize(ctx, position, this);`
	`52`	`+ return normalSerialize(ctx, position, *this);`
`53`	`53`	`}`
`54`	`54`	`auto lastStatChild = statChildren[lastValidIndex];`
`55`	`55`	`auto lastPosition = ctx.GetColumn(lastStatChild->GetTextRange().EndOffset);`
`56`	`56`
`57`	`57`
`58`	`58`	`if (eqPosition - lastPosition <= 2)`
`59`	`59`	`{`
`60`		`- return normalSerialize(ctx, position, this);`
	`60`	`+ return normalSerialize(ctx, position, *this);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -70,10 +70,10 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, int position, FormatE`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- return alignmentSerialize(ctx, position, this, eqAlignedPosition);`
	`73`	`+ return alignmentSerialize(ctx, position, *this, eqAlignedPosition);`
`74`	`74`	`}`
`75`	`75`
`76`		`-void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position, FormatElement* parent, int eqPosition)`
	`76`	`+void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position, FormatElement& parent, int eqPosition)`
`77`	`77`	`{`
`78`	`78`	`for (auto statChild : _children)`
`79`	`79`	`{`
`@@ -98,7 +98,7 @@ void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position`
`98`	`98`	`return normalSerialize(ctx, position, parent);`
`99`	`99`	`}`
`100`	`100`
`101`		`-void AlignmentLayoutElement::normalSerialize(FormatContext& ctx, int position, FormatElement* parent)`
	`101`	`+void AlignmentLayoutElement::normalSerialize(FormatContext& ctx, int position, FormatElement& parent)`
`102`	`102`	`{`
`103`	`103`	`FormatElement::Serialize(ctx, position, parent);`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,17 +56,17 @@ std::shared_ptr<FormatElement> FormatElement::LastValidElement() const`
`56`	`56`	`return nullptr;`
`57`	`57`	`}`
`58`	`58`
`59`		`-void FormatElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`59`	`+void FormatElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`60`	`60`	`{`
`61`	`61`	`for (std::size_t i = 0; i != _children.size(); i++)`
`62`	`62`	`{`
`63`		`- _children[i]->Serialize(ctx, i, this);`
	`63`	`+ _children[i]->Serialize(ctx, i, *this);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`void FormatElement::Format(FormatContext& ctx)`
`68`	`68`	`{`
`69`		`- return Serialize(ctx, 0, nullptr);`
	`69`	`+ return Serialize(ctx, 0, *this);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`void FormatElement::AddTextRange(TextRange range)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ FormatElementType IndentElement::GetType()`
`11`	`11`	`return FormatElementType::IndentElement;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void IndentElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`14`	`+void IndentElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`15`	`15`	`{`
`16`	`16`	`ctx.AddIndent(_specialIndent);`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ FormatElementType KeepBlankElement::GetType()`
`11`	`11`	`return FormatElementType::KeepBlankElement;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void KeepBlankElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`14`	`+void KeepBlankElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`15`	`15`	`{`
`16`	`16`	`ctx.PrintBlank(_blank);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ FormatElementType KeepElement::GetType()`
`12`	`12`	`return FormatElementType::KeepElement;`
`13`	`13`	`}`
`14`	`14`
`15`		`-void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`15`	`+void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`16`	`16`	`{`
`17`	`17`	`int lastElementLine = getLastValidLine(ctx, position, parent);`
`18`	`18`	`int nextElementLine = getNextValidLine(ctx, position, parent);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ FormatElementType LineElement::GetType()`
`11`	`11`	`return FormatElementType::LineElement;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void LineElement::Serialize(FormatContext& ctx, int position,FormatElement* parent)`
	`14`	`+void LineElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`15`	`15`	`{`
`16`	`16`	`ctx.PrintLine(1);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,25 +10,25 @@ FormatElementType LongExpressionLayoutElement::GetType()`
`10`	`10`	`return FormatElementType::LongExpressionLayoutElement;`
`11`	`11`	`}`
`12`	`12`
`13`		`-void LongExpressionLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement* parent)`
	`13`	`+void LongExpressionLayoutElement::Serialize(FormatContext& ctx, int position, FormatElement& parent)`
`14`	`14`	`{`
`15`		`- SerializeSubExpression(ctx, this);`
	`15`	`+ SerializeSubExpression(ctx, *this);`
`16`	`16`	`if (_hasIndent)`
`17`	`17`	`{`
`18`	`18`	`ctx.RecoverIndent();`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-void LongExpressionLayoutElement::SerializeSubExpression(FormatContext& ctx, FormatElement* parent)`
	`22`	`+void LongExpressionLayoutElement::SerializeSubExpression(FormatContext& ctx, FormatElement& parent)`
`23`	`23`	`{`
`24`		`- auto& children = parent->GetChildren();`
	`24`	`+ auto& children = parent.GetChildren();`
`25`	`25`	`for (std::size_t i = 0; i != children.size(); i++)`
`26`	`26`	`{`
`27`	`27`	`auto child = children[i];`
`28`	`28`
`29`	`29`	`if (child->GetType() == FormatElementType::SubExpressionElement)`
`30`	`30`	`{`
`31`		`- SerializeSubExpression(ctx, child.get());`
	`31`	`+ SerializeSubExpression(ctx, *child);`
`32`	`32`	`}`
`33`	`33`	`else`
`34`	`34`	`{`