更新code_format_lib

Author: CppCXY

3rd/uriparser/src/config.h

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

CMakeLists.txt

@@ -32,4 +32,4 @@ endif()
 if(EnableTest)
 	enable_testing()
 	add_subdirectory(Test)
-endif()
+endif()

CodeFormatLib/CMakeLists.txt

@@ -19,6 +19,7 @@ target_include_directories(CodeFormatLib PUBLIC
 target_sources(CodeFormatLib
 	PUBLIC
 	${CodeFormatLib_SOURCE_DIR}/src/CodeFormatLib.cpp
+	${CodeFormatLib_SOURCE_DIR}/src/LuaCodeFormat.cpp
 )
 
 if(NOT WIN32)

CodeFormatLib/src/CodeFormatLib.cpp

@@ -1,51 +1,113 @@
 #include "lua.hpp"
-#include "CodeService/LuaFormatter.h"
+#include "LuaCodeFormat.h"
 
 #ifdef MSVC
 #define EXPORT    __declspec(dllexport)
 #else
 #define EXPORT   
 #endif
 
-
 int format(lua_State* L)
 {
 	int top = lua_gettop(L);
 
-	if (top == 0)
+	if (top < 2)
 	{
 		return 0;
 	}
 
-	if (lua_isstring(L, 1))
+	if (lua_isstring(L, 1) && lua_isstring(L, 2))
 	{
-		std::string buffer = lua_tostring(L, 1);
-		auto parser = LuaParser::LoadFromBuffer(std::move(buffer));
-		parser->BuildAstWithComment();
-
-		if (!parser->GetErrors().empty())
+		try
+		{
+			std::string filename = lua_tostring(L, 1);
+			std::string text = lua_tostring(L, 2);
+			auto formattedText = LuaCodeFormat::GetInstance().Reformat(filename, std::move(text));
+			if (formattedText.empty())
+			{
+				lua_pushboolean(L, false);
+				return 1;
+			}
+			lua_pushboolean(L, true);
+			lua_pushlstring(L, formattedText.c_str(), formattedText.size());
+			return 2;
+		}
+		catch (std::exception& e)
 		{
+			std::string err = e.what();
+			lua_settop(L, top);
 			lua_pushboolean(L, false);
+			lua_pushlstring(L, err.c_str(), err.size());
+			return 2;
+		}
+	}
+	return 0;
+}
+
+enum class UpdateType
+{
+	Created = 1,
+	Changed = 2,
+	Deleted = 3
+};
+
+int range_format(lua_State* L)
+{
+	return 0;
+}
+
+int update_config(lua_State* L)
+{
+	int top = lua_gettop(L);
+
+	if (top < 3)
+	{
+		return 0;
+	}
+
+	if (lua_isinteger(L, 1) && lua_isstring(L, 2) && lua_isstring(L, 3))
+	{
+		try {
+			auto type = static_cast<UpdateType>(lua_tointeger(L, 1));
+			std::string workspaceUri = lua_tostring(L, 2);
+			std::string configPath = lua_tostring(L, 3);
+			switch (type)
+			{
+			case UpdateType::Created:
+			case UpdateType::Changed:
+			{
+				LuaCodeFormat::GetInstance().UpdateCodeStyle(workspaceUri, configPath);
+				break;
+			}
+			case UpdateType::Deleted:
+			{
+				LuaCodeFormat::GetInstance().RemoveCodeStyle(workspaceUri);
+				break;
+			}
+			}
+
+			lua_pushboolean(L, true);
 			return 1;
 		}
-		LuaFormatOptions options;
-		LuaFormatter formatter(parser, options);
-		formatter.BuildFormattedElement();
-
-		std::string formattedText = formatter.GetFormattedText();
-		lua_pushboolean(L, true);
-		lua_pushlstring(L, formattedText.c_str(), formattedText.size());
-		return 2;
+		catch (std::exception& e)
+		{
+			std::string err = e.what();
+			lua_settop(L, top);
+			lua_pushboolean(L, false);
+			lua_pushlstring(L, err.c_str(), err.size());
+			return 2;
+		}
 	}
+
 	return 0;
 }
 
 static const luaL_Reg lib[] = {
-	{"format",format},
+	{"format", format},
+	{"update_config", update_config},
 	{nullptr, nullptr}
 };
 
-
 extern "C"
 EXPORT int luaopen_code_format(lua_State* L)
 {

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -0,0 +1,90 @@
+#include "LuaCodeFormat.h"
+
+#include "CodeService/LuaEditorConfig.h"
+#include "CodeService/LuaFormatter.h"
+#include "LuaParser/LuaParser.h"
+
+LuaCodeFormat& LuaCodeFormat::GetInstance()
+{
+	static LuaCodeFormat instance;
+	return instance;
+}
+
+LuaCodeFormat::LuaCodeFormat()
+	: _defaultOptions(std::make_shared<LuaCodeStyleOptions>())
+{
+}
+
+void LuaCodeFormat::UpdateCodeStyle(const std::string& workspaceUri, const std::string& configPath)
+{
+	auto editorconfig = LuaEditorConfig::LoadFromFile(configPath);
+
+	if (editorconfig == nullptr)
+	{
+		return;
+	}
+
+	for (auto& pair : _editorConfigVector)
+	{
+		if (pair.first == workspaceUri)
+		{
+			pair.second = editorconfig;
+			pair.second->SetWorkspace(workspaceUri);
+			return;
+		}
+	}
+
+	_editorConfigVector.push_back({
+		workspaceUri, editorconfig
+	});
+	_editorConfigVector.back().second->SetWorkspace(workspaceUri);
+}
+
+void LuaCodeFormat::RemoveCodeStyle(const std::string& workspaceUri)
+{
+	for(auto it = _editorConfigVector.begin();it != _editorConfigVector.end();++it)
+	{
+		if(it->first == workspaceUri)
+		{
+			_editorConfigVector.erase(it);
+			return;
+		}
+	}
+}
+
+std::string LuaCodeFormat::Reformat(const std::string& uri, std::string&& text)
+{
+	auto parser = LuaParser::LoadFromBuffer(std::move(text));
+	parser->BuildAstWithComment();
+
+	if (!parser->GetErrors().empty())
+	{
+		return "";
+	}
+	auto options = GetOptions(uri);
+	LuaFormatter formatter(parser, *options);
+	formatter.BuildFormattedElement();
+
+	return formatter.GetFormattedText();
+}
+
+std::string LuaCodeFormat::RangeFormat(const std::string uri, LuaFormatRange range, std::string&& text)
+{
+	return "";
+}
+
+std::shared_ptr<LuaCodeStyleOptions> LuaCodeFormat::GetOptions(const std::string& uri)
+{
+	std::size_t matchLength = 0;
+	std::shared_ptr<LuaCodeStyleOptions> options = _defaultOptions;
+	for (auto it = _editorConfigVector.begin(); it != _editorConfigVector.end(); it++)
+	{
+		if (uri.starts_with(it->first) && it->first.size() > matchLength)
+		{
+			matchLength = it->first.size();
+			options = it->second->Generate(uri);
+		}
+	}
+
+	return options;
+}

CodeFormatLib/src/LuaCodeFormat.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <string_view>
+
+#include "CodeService/LuaCodeStyleOptions.h"
+#include "CodeService/LuaEditorConfig.h"
+#include "CodeService/LuaFormatRange.h"
+
+class LuaCodeFormat
+{
+public:
+	static LuaCodeFormat& GetInstance();
+
+	LuaCodeFormat();
+
+	void UpdateCodeStyle(const std::string& workspaceUri, const std::string& configPath);
+	void RemoveCodeStyle(const std::string& workspaceUri);
+
+	std::string Reformat(const std::string& uri, std::string&& text);
+
+	std::string RangeFormat(const std::string uri, LuaFormatRange range, std::string&& text);
+
+	std::shared_ptr<LuaCodeStyleOptions> GetOptions(const std::string& uri);
+private:
+	std::vector<std::pair<std::string, std::shared_ptr<LuaEditorConfig>>> _editorConfigVector;
+
+	std::shared_ptr<LuaCodeStyleOptions> _defaultOptions;
+};