format提供命名空间

Author: CppCXY

CodeFormat/src/CodeFormat.cpp

@@ -87,7 +87,7 @@ int main(int argc, char** argv)
 		{
 			if (!luaFormat->SetInputFile(cmd.Get<std::string>("file")))
 			{
-				std::cerr << format("Can not find file {}", cmd.Get<std::string>("file")) << std::endl;
+				std::cerr << Util::format("Can not find file {}", cmd.Get<std::string>("file")) << std::endl;
 				return -1;
 			}
 		}
@@ -133,7 +133,7 @@ int main(int argc, char** argv)
 		{
 			if (!luaFormat->Reformat())
 			{
-				std::cerr << format("Exist lua syntax error") << std::endl;
+				std::cerr << Util::format("Exist lua syntax error") << std::endl;
 				return -1;
 			}
 		}

CodeFormat/src/LuaFormat.cpp

@@ -155,7 +155,7 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
 	{
 		auto errors = _parser->GetErrors();
 
-		std::cerr << format("Check {}\t{} error", inputFile, errors.size()) << std::endl;
+		std::cerr << Util::format("Check {}\t{} error", inputFile, errors.size()) << std::endl;
 
 		for (auto& error : errors)
 		{
@@ -194,7 +194,7 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
 	auto diagnosis = ctx.GetDiagnosisInfos();
 	if (!diagnosis.empty())
 	{
-		std::cerr << format("Check {}\t{} warning", inputFile, diagnosis.size()) << std::endl;
+		std::cerr << Util::format("Check {}\t{} warning", inputFile, diagnosis.size()) << std::endl;
 
 		for (auto& d : diagnosis)
 		{
@@ -208,7 +208,7 @@ bool LuaFormat::Check(std::string_view workspace, std::shared_ptr<CodeSpellCheck
 
 		return false;
 	}
-	std::cout << format("Check {} OK", inputFile) << std::endl;
+	std::cout << Util::format("Check {} OK", inputFile) << std::endl;
 	return true;
 }
 
@@ -220,6 +220,6 @@ void LuaFormat::DiagnosisInspection(std::string_view message, TextRange range, s
 	auto startChar = file->GetColumn(range.StartOffset);
 	auto endLine = file->GetLine(range.EndOffset);
 	auto endChar = file->GetColumn(range.EndOffset);
-	std::cerr << format("{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
+	std::cerr << Util::format("{}({}:{} to {}:{}): {}", path, startLine + 1, startChar, endLine + 1, endChar,
 	                    message) << std::endl;
 }

CodeFormat/src/LuaWorkspaceFormat.cpp

@@ -94,11 +94,11 @@ void LuaWorkspaceFormat::ReformatWorkspace()
 		luaFormat.SetOutputFile(file);
 		if (luaFormat.Reformat())
 		{
-			std::cerr << format("reformat {} succeed.", file) << std::endl;
+			std::cerr << Util::format("reformat {} succeed.", file) << std::endl;
 		}
 		else
 		{
-			std::cerr << format("reformat {} fail.", file) << std::endl;
+			std::cerr << Util::format("reformat {} fail.", file) << std::endl;
 		}
 	}
 }

CodeFormatServer/src/LanguageClient.cpp

@@ -62,7 +62,7 @@ void LanguageClient::SendNotification(std::string_view method, std::shared_ptr<v
 	if (_session)
 	{
 		auto dumpResult = json.dump();
-		std::string message = format("Content-Length:{}\r\n\r\n", dumpResult.size());
+		std::string message = Util::format("Content-Length:{}\r\n\r\n", dumpResult.size());
 
 		message.append(dumpResult);
 		_session->Send(std::move(message));
@@ -80,7 +80,7 @@ void LanguageClient::SendRequest(std::string_view method, std::shared_ptr<vscode
 	if (_session)
 	{
 		auto dumpResult = json.dump();
-		std::string message = format("Content-Length:{}\r\n\r\n", dumpResult.size());
+		std::string message = Util::format("Content-Length:{}\r\n\r\n", dumpResult.size());
 
 		message.append(dumpResult);
 		_session->Send(std::move(message));

CodeFormatServer/src/LanguageService.cpp

@@ -459,7 +459,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 
 		std::string moduleDefineName = param->arguments[3];
 
-		std::string requireString = format("local {} = {}(\"{}\")\n", moduleDefineName, config->import_function,
+		std::string requireString = Util::format("local {} = {}(\"{}\")\n", moduleDefineName, config->import_function,
 		                                   moduleName);
 		auto parser = LanguageClient::GetInstance().GetFileParser(uri);
 		auto applyParams = std::make_shared<vscode::ApplyWorkspaceEditParams>();

CodeFormatServer/src/Protocol/ProtocolParser.cpp

@@ -55,7 +55,7 @@ std::string ProtocolParser::SerializeProtocol(std::shared_ptr<vscode::Serializab
 	json["result"] = result->Serialize();
 	json["jsonrpc"] = "2.0";
 	auto dumpResult = json.dump(-1,' ', true, nlohmann::detail::error_handler_t::ignore);
-	std::string message = format("Content-Length:{}\r\n\r\n", dumpResult.size());
+	std::string message = Util::format("Content-Length:{}\r\n\r\n", dumpResult.size());
 
 	message.append(dumpResult);
 	return std::move(message);

CodeFormatServer/src/Service/ModuleService.cpp

@@ -258,15 +258,15 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 		if (pair.second.size() == 1)
 		{
 			auto& luaModule = pair.second.front();
-			completion.detail = format("({})", name);
+			completion.detail = Util::format("({})", name);
 			completion.documentation = format("import from {}", luaModule->FilePath);
 			auto object = nlohmann::json::object();
 			object["moduleName"] = luaModule->ModuleName;
 			object["path"] = luaModule->FilePath;
 			object["name"] = name;
 			command.arguments.push_back(object);
-			labelDetails.detail = format("[{}]", luaModule->ModuleName);
-			labelDetails.description = format("[{}]", luaModule->ModuleName);
+			labelDetails.detail = Util::format("[{}]", luaModule->ModuleName);
+			labelDetails.description = Util::format("[{}]", luaModule->ModuleName);
 		}
 		else
 		{
@@ -279,8 +279,8 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 				object["name"] = name;
 				command.arguments.push_back(object);
 			}
-			labelDetails.detail = format("[{}]", completion.detail);
-			labelDetails.description = format("[{}]", completion.detail);
+			labelDetails.detail = Util::format("[{}]", completion.detail);
+			labelDetails.description = Util::format("[{}]", completion.detail);
 		}
 		completion.command = command;
 		completion.labelDetails = labelDetails;

CodeFormatServer/src/Session/IOSession.cpp

@@ -65,7 +65,7 @@ std::string IOSession::Handle(std::shared_ptr<ProtocolParser> parser)
 		{
 			auto start = chrono::system_clock::now();
 			auto result = _service.Dispatch(parser->GetMethod(), params);
-			std::cerr << format("request {}, it cost: {}ms\n", parser->GetMethod(),
+			std::cerr << Util::format("request {}, it cost: {}ms\n", parser->GetMethod(),
 			                    chrono::duration_cast<chrono::milliseconds>(
 				                    chrono::system_clock::now() - start
 			                    ).count());

CodeService/src/FormatElement/AlignmentElement.cpp

@@ -32,7 +32,7 @@ void AlignmentElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Fo
 	const auto character = ctx.GetColumn(nextOffset);
 	if (character != _alignmentPosition)
 	{
-		ctx.PushDiagnosis(format(LText("'=' should align to character {}"), _alignmentPosition),
+		ctx.PushDiagnosis(Util::format(LText("'=' should align to character {}"), _alignmentPosition),
 		                  TextRange(nextOffset, nextOffset + 1), DiagnosisType::Align);
 	}
 }

CodeService/src/FormatElement/DiagnosisContext.cpp

@@ -39,7 +39,7 @@ std::vector<LuaDiagnosisInfo> DiagnosisContext::GetDiagnosisInfos()
 		{
 			LuaDiagnosisPosition start(line, _options.max_line_length);
 			LuaDiagnosisPosition end(line, character);
-			PushDiagnosis(format(LText("The line width should not exceed {}"), _options.max_line_length), start, end,
+			PushDiagnosis(Util::format(LText("The line width should not exceed {}"), _options.max_line_length), start, end,
 			              DiagnosisType::MaxLineWidth);
 		}
 		_lineMaxLengthMap.clear();