测试C++20特性是否在git action可用

Author: CppCXY

3rd/uriparser/src/config.h

@@ -43,7 +43,7 @@
 
 #define PACKAGE_VERSION "0.9.5"
 
-/* #undef HAVE_WPRINTF */
+#define HAVE_WPRINTF
 /* #undef HAVE_REALLOCARRAY */
 
 

CodeFormatServer/CMakeLists.txt

@@ -31,9 +31,8 @@ target_sources(CodeFormatServer
 	${CodeFormatServer_SOURCE_DIR}/src/CodeFormatServer.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/LanguageClient.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/LanguageService.cpp
-	${CodeFormatServer_SOURCE_DIR}/src/FileManager.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/VirtualFile/VirtualFile.cpp
-	${CodeFormatServer_SOURCE_DIR}/src/Indexs/ModuleIndex.cpp
+	${CodeFormatServer_SOURCE_DIR}/src/Service/Indexs/ModuleIndex.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/IOSession.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/SocketIOSession.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/StandardIOSession.cpp
@@ -45,8 +44,9 @@ target_sources(CodeFormatServer
 	${CodeFormatServer_SOURCE_DIR}/src/VSCode.cpp
 
 	#service
+	${CodeFormatServer_SOURCE_DIR}/src/Service/Service.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Service/ModuleService.cpp
-
+	${CodeFormatServer_SOURCE_DIR}/src/Service/CodeFormatService.cpp
 	# mimalloc
 	${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/src/static.c
 )

CodeFormatServer/src/FileManager.cpp

@@ -1,23 +1,32 @@
 #include "CodeFormatServer/LanguageClient.h"
-
+#include <iterator>
 #include "CodeService/LuaEditorConfig.h"
 #include "CodeService/LuaFormatter.h"
 #include "LuaParser/LuaParser.h"
 #include "Util/format.h"
 #include "Util/Url.h"
 #include "Util/FileFinder.h"
 
+#include "CodeFormatServer/Service/ModuleService.h"
+#include "CodeFormatServer/Service/CodeFormatService.h"
+
+
 LanguageClient& LanguageClient::GetInstance()
 {
-	static LanguageClient instance;
-	return instance;
+	static auto instance = std::make_shared<LanguageClient>();
+	return *instance;
 }
 
 LanguageClient::LanguageClient()
 	: _defaultOptions(std::make_shared<LuaCodeStyleOptions>()),
-	  _idCounter(0),
-	  _moduleIndex(std::make_shared<ModuleIndex>())
+	  _idCounter(0)
+{
+}
+
+void LanguageClient::InitializeService()
 {
+	AddService<CodeFormatService>();
+	AddService<ModuleService>();
 }
 
 void LanguageClient::SetSession(std::shared_ptr<IOSession> session)
@@ -91,11 +100,12 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 		return;
 	}
 
+	auto vscodeDiagnosis = std::make_shared<vscode::PublishDiagnosticsParams>();
+	vscodeDiagnosis->uri = uri;
+
 	auto options = GetOptions(uri);
 	if (!options->enable_check_codestyle)
 	{
-		auto vscodeDiagnosis = std::make_shared<vscode::PublishDiagnosticsParams>();
-		vscodeDiagnosis->uri = uri;
 		SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
 		return;
 	}
@@ -107,29 +117,11 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 		return;
 	}
 
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildFormattedElement();
-
-	auto diagnosisInfos = formatter.GetDiagnosisInfos();
+	auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
+	auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(parser, options);
 
-	auto vscodeDiagnosis = std::make_shared<vscode::PublishDiagnosticsParams>();
-	vscodeDiagnosis->uri = uri;
-
-	for (auto diagnosisInfo : diagnosisInfos)
-	{
-		auto& diagnosis = vscodeDiagnosis->diagnostics.emplace_back();
-		diagnosis.message = diagnosisInfo.Message;
-		diagnosis.range = vscode::Range(
-			vscode::Position(
-				diagnosisInfo.Range.Start.Line,
-				diagnosisInfo.Range.Start.Character
-			),
-			vscode::Position(
-				diagnosisInfo.Range.End.Line,
-				diagnosisInfo.Range.End.Character
-			));
-		diagnosis.severity = vscode::DiagnosticSeverity::Warning;
-	}
+	std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
+	std::copy(moduleDiagnosis.begin(), moduleDiagnosis.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
 
 	SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
 }
@@ -228,7 +220,7 @@ void LanguageClient::UpdateAllDiagnosis()
 
 	finder.AddFindExtension(".lua");
 
-	_moduleIndex->ReBuildIndex(finder.FindFiles());
+	GetService<ModuleService>()->RebuildIndexs(finder.FindFiles());
 
 	for (auto it : _fileMap)
 	{

CodeFormatServer/src/LanguageClient.cpp

@@ -7,6 +7,7 @@
 #include "CodeService/LuaCodeStyleOptions.h"
 #include "CodeService/LuaFormatter.h"
 #include "CodeFormatServer/LanguageClient.h"
+#include "CodeFormatServer/Service/CodeFormatService.h"
 #include "Util/Url.h"
 
 using namespace std::placeholders;
@@ -48,6 +49,8 @@ std::shared_ptr<vscode::Serializable> LanguageService::Dispatch(std::string_view
 
 std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::shared_ptr<vscode::InitializeParams> param)
 {
+	LanguageClient::GetInstance().InitializeService();
+
 	auto result = std::make_shared<vscode::InitializeResult>();
 
 	result->capabilities.documentFormattingProvider = true;
@@ -160,11 +163,10 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnFormatting(
 		return result;
 	}
 
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildFormattedElement();
+	auto newText = LanguageClient::GetInstance().GetService<CodeFormatService>()->Format(parser, options);
 
 	auto& edit = result->edits.emplace_back();
-	edit.newText = formatter.GetFormattedText();
+	edit.newText = std::move(newText);
 	edit.range = vscode::Range(
 		vscode::Position(0, 0),
 		vscode::Position(totalLine + 1, 0)
@@ -218,16 +220,15 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 		return result;
 	}
 
-	auto& edit = result->edits.emplace_back();
-	LuaFormatRange formattedRange(static_cast<int>(param->range.start.line), static_cast<int>(param->range.end.line));
-
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildRangeFormattedElement(formattedRange);
+	LuaFormatRange formatRange(static_cast<int>(param->range.start.line), static_cast<int>(param->range.end.line));
+	auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(
+		formatRange, parser, options);
 
-	edit.newText = formatter.GetRangeFormattedText(formattedRange);
+	auto& edit = result->edits.emplace_back();
+	edit.newText = std::move(formatResult);
 	edit.range = vscode::Range(
-		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
-		vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
+		vscode::Position(formatRange.StartLine, formatRange.StartCharacter),
+		vscode::Position(formatRange.EndLine + 1, formatRange.EndCharacter)
 	);
 	return result;
 }
@@ -253,13 +254,14 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 		return result;
 	}
 
-	auto& edit = result->edits.emplace_back();
+
 	LuaFormatRange formattedRange(static_cast<int>(position.line) - 1, static_cast<int>(position.line) - 1);
 
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildRangeFormattedElement(formattedRange);
+	auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(
+		formattedRange, parser, options);
 
-	edit.newText = formatter.GetRangeFormattedText(formattedRange);
+	auto& edit = result->edits.emplace_back();
+	edit.newText = std::move(formatResult);
 	edit.range = vscode::Range(
 		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
 		vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
@@ -269,17 +271,24 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 
 std::shared_ptr<vscode::CodeActionResult> LanguageService::OnCodeAction(std::shared_ptr<vscode::CodeActionParams> param)
 {
+	auto range = param->range;
+	auto uri = param->textDocument.uri;
+	auto filePath = url::UrlToFilePath(uri);
 	auto codeActionResult = std::make_shared<vscode::CodeActionResult>();
 
-	auto& action = codeActionResult->actions.emplace_back();
-	std::string title = "reformat me";
-	action.title = title;
-	action.command.title = title;
-	action.command.command = "emmylua.reformat.me";
-	action.command.arguments.push_back(param->textDocument.uri);
-	action.command.arguments.push_back(param->range.Serialize());
+	if(LanguageClient::GetInstance().GetService<CodeFormatService>()->IsDiagnosticRange(filePath, range))
+	{
+		auto& action = codeActionResult->actions.emplace_back();
+		std::string title = "reformat me";
+		action.title = title;
+		action.command.title = title;
+		action.command.command = "emmylua.reformat.me";
+		action.command.arguments.push_back(param->textDocument.uri);
+		action.command.arguments.push_back(param->range.Serialize());
+
+		action.kind = vscode::CodeActionKind::QuickFix;
+	}
 
-	action.kind = vscode::CodeActionKind::QuickFix;
 	return codeActionResult;
 }
 
@@ -316,10 +325,10 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 		auto& edit = change.emplace_back();
 		LuaFormatRange formattedRange(static_cast<int>(range.start.line), static_cast<int>(range.end.line));
 
-		LuaFormatter formatter(parser, *options);
-		formatter.BuildRangeFormattedElement(formattedRange);
+		auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(formattedRange, parser, options);
+
+		edit.newText = std::move(formatResult);
 
-		edit.newText = formatter.GetRangeFormattedText(formattedRange);
 		edit.range = vscode::Range(
 			vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
 			vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)