修复算法重构导致的错误

CppCXY · CppCXY · commit 942a4b371bff · 2022-01-20T00:27:40.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, ChildIterator& selfIt, FormatElement& parent)
+void AlignToFirstElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{
@@ -46,7 +46,7 @@ void AlignToFirstElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, F
 	}
 }
 
-void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{
diff --git a/CodeService/src/FormatElement/AlignmentElement.cpp b/CodeService/src/FormatElement/AlignmentElement.cpp
@@ -12,8 +12,7 @@ FormatElementType AlignmentElement::GetType()
 	return FormatElementType::AlignmentElement;
 }
 
-void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
-                                 FormatElement& parent)
+void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	const int blank = _alignmentPosition - static_cast<int>(ctx.GetCharacterCount());
 	if (blank > 0)
@@ -22,8 +21,7 @@ void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
 	}
 }
 
-void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,
-                                 FormatElement& parent)
+void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	const int nextOffset = GetNextValidOffset(selfIt, parent);
 	if (nextOffset == -1)
diff --git a/CodeService/src/FormatElement/AlignmentLayoutElement.cpp b/CodeService/src/FormatElement/AlignmentLayoutElement.cpp
@@ -22,7 +22,7 @@ FormatElementType AlignmentLayoutElement::GetType()
 	return FormatElementType::AlignmentLayoutElement;
 }
 
-void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
+void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator selfIt,
                                        FormatElement& parent)
 {
 	const auto eqPosition = GetAlignPosition(ctx.GetParser());
@@ -37,7 +37,7 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt
 	}
 }
 
-void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,
+void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
                                        FormatElement& parent)
 {
 	const auto eqPosition = GetAlignPosition(ctx.GetParser());
@@ -103,7 +103,7 @@ int AlignmentLayoutElement::GetAlignPosition(std::shared_ptr<LuaParser> luaParse
 	return eqAlignedPosition;
 }
 
-void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterator& selfIt, int eqPosition,
+void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterator selfIt, int eqPosition,
                                                 FormatElement& parent)
 {
 	for (const auto& statChild : _children)
@@ -132,7 +132,7 @@ void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterato
 }
 
 void AlignmentLayoutElement::AlignmentDiagnosis(DiagnosisContext& ctx,
-                                                ChildIterator& selfIt,
+                                                ChildIterator selfIt,
                                                 int eqPosition, FormatElement& parent)
 {
 	for (const auto& statChild : _children)
diff --git a/CodeService/src/FormatElement/FormatElement.cpp b/CodeService/src/FormatElement/FormatElement.cpp
@@ -61,38 +61,38 @@ std::shared_ptr<FormatElement> FormatElement::LastValidElement() const
 	return nullptr;
 }
 
-void FormatElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void FormatElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{
 		(*it)->Serialize(ctx, it, *this);
 	}
 }
 
-void FormatElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void FormatElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{
 		(*it)->Diagnosis(ctx, it, *this);
 	}
-} 
+}
 
 void FormatElement::Format(FormatContext& ctx)
 {
 	// workaround
-	for (auto it = _children.begin(); it != _children.end(); ++it)
-	{
-		(*it)->Serialize(ctx, it, *this);
-	}
+	auto root = std::make_shared<FormatElement>();
+	root->AddChild(shared_from_this());
+	auto it = root->GetChildren().begin();
+	Serialize(ctx, it, *root);
 }
 
 void FormatElement::DiagnosisCodeStyle(DiagnosisContext& ctx)
 {
 	// workaround
-	for (auto it = _children.begin(); it != _children.end(); ++it)
-	{
-		(*it)->Diagnosis(ctx, it, *this);
-	}
+	auto root = std::make_shared<FormatElement>();
+	root->AddChild(shared_from_this());
+	auto it = root->GetChildren().begin();
+	Diagnosis(ctx, it, *root);
 }
 
 void FormatElement::AddTextRange(TextRange range)
@@ -139,7 +139,6 @@ int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)
 
 	for (; rIt != siblings.rend(); ++rIt)
 	{
-
 		auto sibling = *rIt;
 		if (sibling->HasValidTextRange())
 		{
@@ -153,7 +152,6 @@ int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)
 
 int FormatElement::GetNextValidOffset(ChildIterator& it, FormatElement& parent)
 {
-
 	auto& siblings = parent.GetChildren();
 	++it;
 	for (; it != siblings.end(); ++it)
diff --git a/CodeService/src/FormatElement/IndentElement.cpp b/CodeService/src/FormatElement/IndentElement.cpp
@@ -13,7 +13,7 @@ FormatElementType IndentElement::GetType()
 	return FormatElementType::IndentElement;
 }
 
-void IndentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void IndentElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	ctx.AddIndent(_specialIndent);
 
@@ -22,7 +22,7 @@ void IndentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatE
 	ctx.RecoverIndent();
 }
 
-void IndentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void IndentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	ctx.AddIndent(_specialIndent);
 
diff --git a/CodeService/src/FormatElement/KeepBlankElement.cpp b/CodeService/src/FormatElement/KeepBlankElement.cpp
@@ -12,7 +12,7 @@ FormatElementType KeepBlankElement::GetType()
 	return FormatElementType::KeepBlankElement;
 }
 
-void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	int nextOffset = GetNextValidOffset(selfIt, parent);
 	if (nextOffset != -1)
@@ -21,7 +21,7 @@ void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, Form
 	}
 }
 
-void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	const int lastOffset = GetLastValidOffset(selfIt, parent);
 	const int nextOffset = GetNextValidOffset(selfIt, parent);
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, ChildIterator& selfIt,
+void KeepElement::Serialize(FormatContext& ctx, ChildIterator selfIt,
                             FormatElement& parent)
 {
 
@@ -39,7 +39,7 @@ void KeepElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
 	}
 }
 
-void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,
+void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
                             FormatElement& 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, ChildIterator& selfIt,
+void KeepLineElement::Serialize(FormatContext& ctx, ChildIterator selfIt,
                                 FormatElement& parent)
 {
 	const int lastElementLine = GetLastValidLine(ctx, selfIt, parent);
@@ -36,7 +36,7 @@ void KeepLineElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
 	ctx.PrintLine(line);
 }
 
-void KeepLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,
+void KeepLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
                                 FormatElement& parent)
 {
 	ctx.SetCharacterCount(0);
diff --git a/CodeService/src/FormatElement/LineElement.cpp b/CodeService/src/FormatElement/LineElement.cpp
@@ -11,12 +11,12 @@ FormatElementType LineElement::GetType()
 	return FormatElementType::LineElement;
 }
 
-void LineElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void LineElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	ctx.PrintLine(1);
 }
 
-void LineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void LineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	ctx.SetCharacterCount(0);
 }
diff --git a/CodeService/src/FormatElement/LongExpressionLayoutElement.cpp b/CodeService/src/FormatElement/LongExpressionLayoutElement.cpp
@@ -12,7 +12,7 @@ FormatElementType LongExpressionLayoutElement::GetType()
 	return FormatElementType::LongExpressionLayoutElement;
 }
 
-void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	SerializeSubExpression(ctx, *this);
 	if (_hasContinuation)
@@ -21,7 +21,7 @@ void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator& s
 	}
 }
 
-void LongExpressionLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void LongExpressionLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	DiagnosisSubExpression(ctx, *this);
 	if (_hasContinuation)
diff --git a/CodeService/src/FormatElement/MinLineElement.cpp b/CodeService/src/FormatElement/MinLineElement.cpp
@@ -12,7 +12,7 @@ FormatElementType MinLineElement::GetType()
 	return FormatElementType::MinLineElement;
 }
 
-void MinLineElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void MinLineElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	auto minLine = 0;
 	if (_line > 0)
@@ -38,7 +38,7 @@ void MinLineElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, Format
 	ctx.PrintLine(line);
 }
 
-void MinLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void MinLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	if (_line <= 0)
 	{
diff --git a/CodeService/src/FormatElement/StatementElement.cpp b/CodeService/src/FormatElement/StatementElement.cpp
@@ -5,14 +5,14 @@ FormatElementType StatementElement::GetType()
 	return FormatElementType::StatementElement;
 }
 
-void StatementElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void StatementElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	FormatElement::Serialize(ctx, selfIt, parent);
 
 	ctx.PrintLine(1);
 }
 
-void StatementElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void StatementElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	FormatElement::Diagnosis(ctx, selfIt, parent);
 	ctx.SetCharacterCount(0);
diff --git a/CodeService/src/FormatElement/TextElement.cpp b/CodeService/src/FormatElement/TextElement.cpp
@@ -18,12 +18,12 @@ FormatElementType TextElement::GetType()
 	return FormatElementType::TextElement;
 }
 
-void TextElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void TextElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	ctx.Print(*this);
 }
 
-void TextElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
+void TextElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)
 {
 	const int character = ctx.GetColumn(_textRange.EndOffset);
 	ctx.SetCharacterCount(character + 1);
diff --git a/include/CodeService/FormatElement/AlignToFirstElement.h b/include/CodeService/FormatElement/AlignToFirstElement.h
@@ -9,8 +9,8 @@ class AlignToFirstElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _lowestIndent;
 };
diff --git a/include/CodeService/FormatElement/AlignmentElement.h b/include/CodeService/FormatElement/AlignmentElement.h
@@ -8,8 +8,8 @@ class AlignmentElement : public FormatElement
 	AlignmentElement(int alignmentPosition);
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _alignmentPosition;
 };
diff --git a/include/CodeService/FormatElement/AlignmentLayoutElement.h b/include/CodeService/FormatElement/AlignmentLayoutElement.h
@@ -7,12 +7,12 @@ class AlignmentLayoutElement : public FormatElement
 public:
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int GetAlignPosition(std::shared_ptr<LuaParser> luaParser);
-	void AlignmentSerialize(FormatContext& ctx, ChildIterator& selfIt, int eqPosition,
+	void AlignmentSerialize(FormatContext& ctx, ChildIterator selfIt, int eqPosition,
 	                        FormatElement& parent);
-	void AlignmentDiagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, int eqPosition,
+	void AlignmentDiagnosis(DiagnosisContext& ctx, ChildIterator selfIt, int eqPosition,
 	                        FormatElement& parent);
 };
diff --git a/include/CodeService/FormatElement/FormatElement.h b/include/CodeService/FormatElement/FormatElement.h
@@ -8,7 +8,7 @@
 #include "CodeService/LuaFormatRange.h"
 
 
-class FormatElement //: std::enable_shared_from_this<FormatElement>
+class FormatElement : public std::enable_shared_from_this<FormatElement>
 {
 public:
 	using ChildContainer = std::vector<std::shared_ptr<FormatElement>>;
@@ -19,9 +19,9 @@ class FormatElement //: std::enable_shared_from_this<FormatElement>
 
 	virtual FormatElementType GetType();
 
-	virtual void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent);
+	virtual void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent);
 
-	virtual void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent);
+	virtual void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent);
 
 	void Format(FormatContext& ctx);
 
diff --git a/include/CodeService/FormatElement/IndentElement.h b/include/CodeService/FormatElement/IndentElement.h
@@ -9,8 +9,8 @@ class IndentElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _specialIndent;
 };
diff --git a/include/CodeService/FormatElement/KeepBlankElement.h b/include/CodeService/FormatElement/KeepBlankElement.h
@@ -8,8 +8,8 @@ class KeepBlankElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _blank;
 };
diff --git a/include/CodeService/FormatElement/KeepElement.h b/include/CodeService/FormatElement/KeepElement.h
@@ -13,8 +13,8 @@ class KeepElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _keepBlank;
 	bool _hasLinebreak;
diff --git a/include/CodeService/FormatElement/KeepLineElement.h b/include/CodeService/FormatElement/KeepLineElement.h
@@ -9,9 +9,9 @@ class KeepLineElement : public FormatElement
 
 	FormatElementType GetType() override;
 
-	void Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 
-	void Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 
 private:
 	int _line;
diff --git a/include/CodeService/FormatElement/LineElement.h b/include/CodeService/FormatElement/LineElement.h
diff --git a/include/CodeService/FormatElement/LongExpressionLayoutElement.h b/include/CodeService/FormatElement/LongExpressionLayoutElement.h
diff --git a/include/CodeService/FormatElement/MinLineElement.h b/include/CodeService/FormatElement/MinLineElement.h
diff --git a/include/CodeService/FormatElement/StatementElement.h b/include/CodeService/FormatElement/StatementElement.h
diff --git a/include/CodeService/FormatElement/TextElement.h b/include/CodeService/FormatElement/TextElement.h

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, ChildIterator& selfIt, FormatElement& parent)`
	`13`	`+void AlignToFirstElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`14`	`14`	`{`
`15`	`15`	`for (auto it = _children.begin(); it != _children.end(); ++it)`
`16`	`16`	`{`
`@@ -46,7 +46,7 @@ void AlignToFirstElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, F`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`49`	`+void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`50`	`50`	`{`
`51`	`51`	`for (auto it = _children.begin(); it != _children.end(); ++it)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ FormatElementType AlignmentElement::GetType()`
`12`	`12`	`return FormatElementType::AlignmentElement;`
`13`	`13`	`}`
`14`	`14`
`15`		`-void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,`
`16`		`- FormatElement& parent)`
	`15`	`+void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`17`	`16`	`{`
`18`	`17`	`const int blank = _alignmentPosition - static_cast<int>(ctx.GetCharacterCount());`
`19`	`18`	`if (blank > 0)`
`@@ -22,8 +21,7 @@ void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`
`25`		`-void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,`
`26`		`- FormatElement& parent)`
	`24`	`+void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`27`	`25`	`{`
`28`	`26`	`const int nextOffset = GetNextValidOffset(selfIt, parent);`
`29`	`27`	`if (nextOffset == -1)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ FormatElementType AlignmentLayoutElement::GetType()`
`22`	`22`	`return FormatElementType::AlignmentLayoutElement;`
`23`	`23`	`}`
`24`	`24`
`25`		`-void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,`
	`25`	`+void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator selfIt,`
`26`	`26`	`FormatElement& parent)`
`27`	`27`	`{`
`28`	`28`	`const auto eqPosition = GetAlignPosition(ctx.GetParser());`
`@@ -37,7 +37,7 @@ void AlignmentLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,`
	`40`	`+void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,`
`41`	`41`	`FormatElement& parent)`
`42`	`42`	`{`
`43`	`43`	`const auto eqPosition = GetAlignPosition(ctx.GetParser());`
`@@ -103,7 +103,7 @@ int AlignmentLayoutElement::GetAlignPosition(std::shared_ptr<LuaParser> luaParse`
`103`	`103`	`return eqAlignedPosition;`
`104`	`104`	`}`
`105`	`105`
`106`		`-void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterator& selfIt, int eqPosition,`
	`106`	`+void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterator selfIt, int eqPosition,`
`107`	`107`	`FormatElement& parent)`
`108`	`108`	`{`
`109`	`109`	`for (const auto& statChild : _children)`
`@@ -132,7 +132,7 @@ void AlignmentLayoutElement::AlignmentSerialize(FormatContext& ctx, ChildIterato`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`void AlignmentLayoutElement::AlignmentDiagnosis(DiagnosisContext& ctx,`
`135`		`- ChildIterator& selfIt,`
	`135`	`+ ChildIterator selfIt,`
`136`	`136`	`int eqPosition, FormatElement& parent)`
`137`	`137`	`{`
`138`	`138`	`for (const auto& statChild : _children)`
Original file line number	Diff line number	Diff line change
`@@ -61,38 +61,38 @@ std::shared_ptr<FormatElement> FormatElement::LastValidElement() const`
`61`	`61`	`return nullptr;`
`62`	`62`	`}`
`63`	`63`
`64`		`-void FormatElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`64`	`+void FormatElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`65`	`65`	`{`
`66`	`66`	`for (auto it = _children.begin(); it != _children.end(); ++it)`
`67`	`67`	`{`
`68`	`68`	`(it)->Serialize(ctx, it, this);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-void FormatElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`72`	`+void FormatElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`73`	`73`	`{`
`74`	`74`	`for (auto it = _children.begin(); it != _children.end(); ++it)`
`75`	`75`	`{`
`76`	`76`	`(it)->Diagnosis(ctx, it, this);`
`77`	`77`	`}`
`78`		`-}`
	`78`	`+}`
`79`	`79`
`80`	`80`	`void FormatElement::Format(FormatContext& ctx)`
`81`	`81`	`{`
`82`	`82`	`// workaround`
`83`		`- for (auto it = _children.begin(); it != _children.end(); ++it)`
`84`		`- {`
`85`		`- (it)->Serialize(ctx, it, this);`
`86`		`- }`
	`83`	`+ auto root = std::make_shared<FormatElement>();`
	`84`	`+ root->AddChild(shared_from_this());`
	`85`	`+ auto it = root->GetChildren().begin();`
	`86`	`+ Serialize(ctx, it, *root);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`void FormatElement::DiagnosisCodeStyle(DiagnosisContext& ctx)`
`90`	`90`	`{`
`91`	`91`	`// workaround`
`92`		`- for (auto it = _children.begin(); it != _children.end(); ++it)`
`93`		`- {`
`94`		`- (it)->Diagnosis(ctx, it, this);`
`95`		`- }`
	`92`	`+ auto root = std::make_shared<FormatElement>();`
	`93`	`+ root->AddChild(shared_from_this());`
	`94`	`+ auto it = root->GetChildren().begin();`
	`95`	`+ Diagnosis(ctx, it, *root);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void FormatElement::AddTextRange(TextRange range)`
`@@ -139,7 +139,6 @@ int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)`
`139`	`139`
`140`	`140`	`for (; rIt != siblings.rend(); ++rIt)`
`141`	`141`	`{`
`142`		`-`
`143`	`142`	`auto sibling = *rIt;`
`144`	`143`	`if (sibling->HasValidTextRange())`
`145`	`144`	`{`
`@@ -153,7 +152,6 @@ int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)`
`153`	`152`
`154`	`153`	`int FormatElement::GetNextValidOffset(ChildIterator& it, FormatElement& parent)`
`155`	`154`	`{`
`156`		`-`
`157`	`155`	`auto& siblings = parent.GetChildren();`
`158`	`156`	`++it;`
`159`	`157`	`for (; it != siblings.end(); ++it)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ FormatElementType IndentElement::GetType()`
`13`	`13`	`return FormatElementType::IndentElement;`
`14`	`14`	`}`
`15`	`15`
`16`		`-void IndentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`16`	`+void IndentElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`17`	`17`	`{`
`18`	`18`	`ctx.AddIndent(_specialIndent);`
`19`	`19`
`@@ -22,7 +22,7 @@ void IndentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatE`
`22`	`22`	`ctx.RecoverIndent();`
`23`	`23`	`}`
`24`	`24`
`25`		`-void IndentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`25`	`+void IndentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`26`	`26`	`{`
`27`	`27`	`ctx.AddIndent(_specialIndent);`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ FormatElementType KeepBlankElement::GetType()`
`12`	`12`	`return FormatElementType::KeepBlankElement;`
`13`	`13`	`}`
`14`	`14`
`15`		`-void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`15`	`+void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`16`	`16`	`{`
`17`	`17`	`int nextOffset = GetNextValidOffset(selfIt, parent);`
`18`	`18`	`if (nextOffset != -1)`
`@@ -21,7 +21,7 @@ void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, Form`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`24`	`+void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`25`	`25`	`{`
`26`	`26`	`const int lastOffset = GetLastValidOffset(selfIt, parent);`
`27`	`27`	`const int nextOffset = GetNextValidOffset(selfIt, parent);`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ FormatElementType LineElement::GetType()`
`11`	`11`	`return FormatElementType::LineElement;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void LineElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`14`	`+void LineElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`15`	`15`	`{`
`16`	`16`	`ctx.PrintLine(1);`
`17`	`17`	`}`
`18`	`18`
`19`		`-void LineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`19`	`+void LineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`20`	`20`	`{`
`21`	`21`	`ctx.SetCharacterCount(0);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ FormatElementType LongExpressionLayoutElement::GetType()`
`12`	`12`	`return FormatElementType::LongExpressionLayoutElement;`
`13`	`13`	`}`
`14`	`14`
`15`		`-void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`15`	`+void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`16`	`16`	`{`
`17`	`17`	`SerializeSubExpression(ctx, *this);`
`18`	`18`	`if (_hasContinuation)`
`@@ -21,7 +21,7 @@ void LongExpressionLayoutElement::Serialize(FormatContext& ctx, ChildIterator& s`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-void LongExpressionLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)`
	`24`	`+void LongExpressionLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent)`
`25`	`25`	`{`
`26`	`26`	`DiagnosisSubExpression(ctx, *this);`
`27`	`27`	`if (_hasContinuation)`