codeService去掉stdoptional

Author: CppCXY

CodeFormatServer/CMakeLists.txt

@@ -50,6 +50,7 @@ target_sources(CodeFormatServer
 
 	#Service/AstUtil
 	${CodeFormatServer_SOURCE_DIR}/src/Service/AstUtil/ModuleFinder.cpp
+	${CodeFormatServer_SOURCE_DIR}/src/Service/AstUtil/AstPattern.cpp
 
 	#service
 	${CodeFormatServer_SOURCE_DIR}/src/Service/Service.cpp

CodeFormatServer/src/Service/AstUtil/AstPattern.cpp

@@ -0,0 +1,10 @@
+#include "CodeFormatServer/Service/AstUtil/AstPattern.h"
+
+AstPattern::AstPattern(LuaAstNodeType baseType)
+{
+}
+
+bool AstPattern::Match(std::shared_ptr<LuaAstNode> node)
+{
+	return true;
+}

CodeFormatServer/src/Service/CompletionService.cpp

@@ -15,7 +15,14 @@ void CompletionService::Start()
 	AddCompleteContributor({LuaAstNodeType::NameIdentify},
 	                       std::bind(&ModuleService::GetModuleCompletions, GetService<ModuleService>().get(),
 	                                 _1, _2, _3, _4));
-	// AddCompleteContributor({LuaAstNodeType::LiteralExpression},
+	// AddCompleteContributor({
+	// 	                       LuaAstNodeType::LiteralExpression,
+	// 	                       LuaAstNodeType::Expression,
+	// 	                       LuaAstNodeType::CallArgList,
+	// 	                       LuaAstNodeType::CallExpression,
+	//
+	//
+	//                        },
 	//                        std::bind(&ModuleService::GetRequireCompletions, GetService<ModuleService>().get(),
 	//                                  _1, _2, _3, _4)
 	// );

CodeFormatServer/src/Service/ModuleService.cpp

@@ -289,10 +289,10 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 	return result;
 }
 
-// std::vector<vscode::CompletionItem> ModuleService::GetRequireCompletions(std::shared_ptr<LuaAstNode> expression,
-//                                                                          std::shared_ptr<LuaParser> parser,
-//                                                                          std::shared_ptr<LuaCodeStyleOptions> options,
-//                                                                          std::string_view uri)
-// {
-//
-// }
+std::vector<vscode::CompletionItem> ModuleService::GetRequireCompletions(std::shared_ptr<LuaAstNode> expression,
+                                                                         std::shared_ptr<LuaParser> parser,
+                                                                         std::shared_ptr<LuaCodeStyleOptions> options,
+                                                                         std::string_view uri)
+{
+	return {};
+}

CodeService/src/FormatElement/AlignToFirstElement.cpp

@@ -10,7 +10,7 @@ FormatElementType AlignToFirstElement::GetType()
 	return FormatElementType::AlignToFirstElement;
 }
 
-void AlignToFirstElement::Serialize(FormatContext& ctx, std::optional<FormatElement::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, std::optional<FormatElem
 	}
 }
 
-void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement::ChildIterator> selfIt, FormatElement& parent)
+void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{

CodeService/src/FormatElement/AlignmentElement.cpp

@@ -12,7 +12,7 @@ FormatElementType AlignmentElement::GetType()
 	return FormatElementType::AlignmentElement;
 }
 
-void AlignmentElement::Serialize(FormatContext& ctx, std::optional<FormatElement::ChildIterator> selfIt,
+void AlignmentElement::Serialize(FormatContext& ctx, ChildIterator& selfIt,
                                  FormatElement& parent)
 {
 	const int blank = _alignmentPosition - static_cast<int>(ctx.GetCharacterCount());
@@ -22,15 +22,10 @@ void AlignmentElement::Serialize(FormatContext& ctx, std::optional<FormatElement
 	}
 }
 
-void AlignmentElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement::ChildIterator> selfIt,
+void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt,
                                  FormatElement& parent)
 {
-	if (!selfIt.has_value())
-	{
-		return;
-	}
-	auto it = selfIt.value();
-	const int nextOffset = GetNextValidOffset(it, parent);
+	const int nextOffset = GetNextValidOffset(selfIt, parent);
 	if (nextOffset == -1)
 	{
 		return;

CodeService/src/FormatElement/AlignmentLayoutElement.cpp

@@ -22,7 +22,7 @@ FormatElementType AlignmentLayoutElement::GetType()
 	return FormatElementType::AlignmentLayoutElement;
 }
 
-void AlignmentLayoutElement::Serialize(FormatContext& ctx, std::optional<FormatElement::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, std::optional<FormatE
 	}
 }
 
-void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement::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, std::optional<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, std::optiona
 }
 
 void AlignmentLayoutElement::AlignmentDiagnosis(DiagnosisContext& ctx,
-                                                std::optional<FormatElement::ChildIterator> selfIt,
+                                                ChildIterator& selfIt,
                                                 int eqPosition, FormatElement& parent)
 {
 	for (const auto& statChild : _children)

CodeService/src/FormatElement/FormatElement.cpp

@@ -61,15 +61,15 @@ std::shared_ptr<FormatElement> FormatElement::LastValidElement() const
 	return nullptr;
 }
 
-void FormatElement::Serialize(FormatContext& ctx, std::optional<FormatElement::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, std::optional<FormatElement::ChildIterator> selfIt, FormatElement& parent)
+void FormatElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
 {
 	for (auto it = _children.begin(); it != _children.end(); ++it)
 	{
@@ -80,13 +80,19 @@ void FormatElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement
 void FormatElement::Format(FormatContext& ctx)
 {
 	// workaround
-	return Serialize(ctx, {}, *this);
+	for (auto it = _children.begin(); it != _children.end(); ++it)
+	{
+		(*it)->Serialize(ctx, it, *this);
+	}
 }
 
 void FormatElement::DiagnosisCodeStyle(DiagnosisContext& ctx)
 {
 	// workaround
-	return Diagnosis(ctx, {}, *this);
+	for (auto it = _children.begin(); it != _children.end(); ++it)
+	{
+		(*it)->Diagnosis(ctx, it, *this);
+	}
 }
 
 void FormatElement::AddTextRange(TextRange range)
@@ -126,10 +132,10 @@ int FormatElement::GetNextValidLine(FormatContext& ctx, ChildIterator it, Format
 	}
 }
 
-int FormatElement::GetLastValidOffset(ChildIterator it, FormatElement& parent)
+int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)
 {
 	auto& siblings = parent.GetChildren();
-	auto rIt = std::reverse_iterator<decltype(it)>(it);
+	auto rIt = std::reverse_iterator<std::remove_reference_t<decltype(it)>>(it);
 
 	for (; rIt != siblings.rend(); ++rIt)
 	{
@@ -145,7 +151,7 @@ int FormatElement::GetLastValidOffset(ChildIterator it, FormatElement& parent)
 	return parent.GetTextRange().StartOffset;
 }
 
-int FormatElement::GetNextValidOffset(ChildIterator it, FormatElement& parent)
+int FormatElement::GetNextValidOffset(ChildIterator& it, FormatElement& parent)
 {
 
 	auto& siblings = parent.GetChildren();

CodeService/src/FormatElement/IndentElement.cpp

@@ -13,7 +13,7 @@ FormatElementType IndentElement::GetType()
 	return FormatElementType::IndentElement;
 }
 
-void IndentElement::Serialize(FormatContext& ctx, std::optional<FormatElement::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, std::optional<FormatElement::C
 	ctx.RecoverIndent();
 }
 
-void IndentElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement::ChildIterator> selfIt, FormatElement& parent)
+void IndentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
 {
 	ctx.AddIndent(_specialIndent);
 

CodeService/src/FormatElement/KeepBlankElement.cpp

@@ -12,29 +12,21 @@ FormatElementType KeepBlankElement::GetType()
 	return FormatElementType::KeepBlankElement;
 }
 
-void KeepBlankElement::Serialize(FormatContext& ctx, std::optional<FormatElement::ChildIterator> selfIt, FormatElement& parent)
+void KeepBlankElement::Serialize(FormatContext& ctx, ChildIterator& selfIt, FormatElement& parent)
 {
-	if(selfIt.has_value())
+	int nextOffset = GetNextValidOffset(selfIt, parent);
+	if (nextOffset != -1)
 	{
-		int nextOffset = GetNextValidOffset(selfIt.value(), parent);
-		if (nextOffset != -1)
-		{
-			ctx.PrintBlank(_blank);
-		}
+		ctx.PrintBlank(_blank);
 	}
 }
 
-void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, std::optional<FormatElement::ChildIterator> selfIt, FormatElement& parent)
+void KeepBlankElement::Diagnosis(DiagnosisContext& ctx, ChildIterator& selfIt, FormatElement& parent)
 {
-	if(!selfIt.has_value())
-	{
-		return;
-	}
-
-	const int lastOffset = GetLastValidOffset(selfIt.value(), parent);
-	const int nextOffset = GetNextValidOffset(selfIt.value(), parent);
+	const int lastOffset = GetLastValidOffset(selfIt, parent);
+	const int nextOffset = GetNextValidOffset(selfIt, parent);
 
- 	if (nextOffset == -1)
+	if (nextOffset == -1)
 	{
 		return;
 	}