codeformatlib支持范围格式化

Author: CppCXY

CodeFormatLib/src/CodeFormatLib.cpp

@@ -53,6 +53,45 @@ enum class UpdateType
 
 int range_format(lua_State* L)
 {
+	int top = lua_gettop(L);
+
+	if (top < 4)
+	{
+		return 0;
+	}
+
+	if (lua_isstring(L, 1) && lua_isstring(L, 2) && lua_isinteger(L, 3) && lua_isinteger(L, 4))
+	{
+		try
+		{
+			std::string filename = lua_tostring(L, 1);
+			std::string text = lua_tostring(L, 2);
+			int startLine = lua_tointeger(L, 3);
+			int endLine = lua_tointeger(L, 4);
+
+			LuaFormatRange range(startLine, endLine);
+			auto formattedText = LuaCodeFormat::GetInstance().RangeFormat(filename, range, std::move(text));
+			if (formattedText.empty())
+			{
+				lua_pushboolean(L, false);
+				return 1;
+			}
+			lua_pushboolean(L, true);
+			lua_pushlstring(L, formattedText.c_str(), formattedText.size());
+			lua_pushinteger(L, range.StartLine);
+			lua_pushinteger(L, range.EndLine);
+
+			return 4;
+		}
+		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;
 }
 
@@ -67,23 +106,24 @@ int update_config(lua_State* L)
 
 	if (lua_isinteger(L, 1) && lua_isstring(L, 2) && lua_isstring(L, 3))
 	{
-		try {
+		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;
-			}
+				{
+					LuaCodeFormat::GetInstance().UpdateCodeStyle(workspaceUri, configPath);
+					break;
+				}
 			case UpdateType::Deleted:
-			{
-				LuaCodeFormat::GetInstance().RemoveCodeStyle(workspaceUri);
-				break;
-			}
+				{
+					LuaCodeFormat::GetInstance().RemoveCodeStyle(workspaceUri);
+					break;
+				}
 			}
 
 			lua_pushboolean(L, true);
@@ -104,6 +144,7 @@ int update_config(lua_State* L)
 
 static const luaL_Reg lib[] = {
 	{"format", format},
+	{"range_format", range_format},
 	{"update_config", update_config},
 	{nullptr, nullptr}
 };

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -69,9 +69,20 @@ std::string LuaCodeFormat::Reformat(const std::string& uri, std::string&& text)
 	return formatter.GetFormattedText();
 }
 
-std::string LuaCodeFormat::RangeFormat(const std::string uri, LuaFormatRange range, std::string&& text)
+std::string LuaCodeFormat::RangeFormat(const std::string uri, LuaFormatRange& range, std::string&& text)
 {
-	return "";
+	auto parser = LuaParser::LoadFromBuffer(std::move(text));
+	parser->BuildAstWithComment();
+
+	if (!parser->GetErrors().empty())
+	{
+		return "";
+	}
+	auto options = GetOptions(uri);
+	LuaFormatter formatter(parser, *options);
+	formatter.BuildRangeFormattedElement(range);
+
+	return formatter.GetFormattedText();
 }
 
 std::shared_ptr<LuaCodeStyleOptions> LuaCodeFormat::GetOptions(const std::string& uri)

CodeFormatLib/src/LuaCodeFormat.h

@@ -20,7 +20,7 @@ class LuaCodeFormat
 
 	std::string Reformat(const std::string& uri, std::string&& text);
 
-	std::string RangeFormat(const std::string uri, LuaFormatRange range, 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: