codeformatlib新增诊断

Author: CppCXY

CodeFormatLib/src/CodeFormatLib.cpp

@@ -1,4 +1,4 @@
-#include "lua.hpp"
+#include "lua.hpp"
 #include "LuaCodeFormat.h"
 
 #ifdef MSVC
@@ -142,10 +142,104 @@ int update_config(lua_State* L)
 	return 0;
 }
 
+int diagnose_file(lua_State* L)
+{
+	int top = lua_gettop(L);
+
+	if (top < 2)
+	{
+		return 0;
+	}
+
+	if (lua_isstring(L, 1) && lua_isstring(L, 2))
+	{
+		try
+		{
+			std::string filename = lua_tostring(L, 1);
+			std::string text = lua_tostring(L, 2);
+			auto result = LuaCodeFormat::GetInstance().Diagnose(filename, std::move(text));
+			if (!result.first)
+			{
+				lua_pushboolean(L, false);
+				return 1;
+			}
+			auto& diagnosticInfos = result.second;
+
+			lua_pushboolean(L, true);
+			int count = 1;
+			lua_newtable(L);
+			for (auto& diagnosticInfo : diagnosticInfos)
+			{
+				// 诊断信息表
+				lua_newtable(L);
+
+				//message
+				{
+					lua_pushstring(L, "message");
+					lua_pushlstring(L, diagnosticInfo.Message.c_str(), diagnosticInfo.Message.size());
+					lua_rawset(L, -3);
+				}
+
+				// range
+				{
+					lua_pushstring(L, "range");
+					//range table
+					lua_newtable(L);
+
+					lua_pushstring(L, "start");
+					// start table
+					lua_newtable(L);
+					lua_pushstring(L, "line");
+					lua_pushinteger(L, diagnosticInfo.Range.Start.Line);
+					lua_rawset(L, -3);
+
+					lua_pushstring(L, "character");
+					lua_pushinteger(L, diagnosticInfo.Range.Start.Character);
+					lua_rawset(L, -3);
+
+					lua_rawset(L, -3); // set start = {}
+
+					lua_pushstring(L, "end");
+					// end table
+					lua_newtable(L);
+					lua_pushstring(L, "line");
+					lua_pushinteger(L, diagnosticInfo.Range.Start.Line);
+					lua_rawset(L, -3);
+
+					lua_pushstring(L, "character");
+					lua_pushinteger(L, diagnosticInfo.Range.Start.Character);
+					lua_rawset(L, -3);
+
+					lua_rawset(L, -3); // set end = {}
+
+					lua_rawset(L, -3); // set range = {}
+				}
+
+				// 不确认lua会不会把他改成宏，所以不要在这里用++count
+				lua_rawseti(L, -2, count);
+				count++;
+			}
+
+			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},
 	{"range_format", range_format},
 	{"update_config", update_config},
+	{"diagnose_file", diagnose_file},
 	{nullptr, nullptr}
 };
 

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -69,7 +69,7 @@ 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)
 {
 	auto parser = LuaParser::LoadFromBuffer(std::move(text));
 	parser->BuildAstWithComment();
@@ -85,6 +85,22 @@ std::string LuaCodeFormat::RangeFormat(const std::string uri, LuaFormatRange& ra
 	return formatter.GetRangeFormattedText(range);
 }
 
+std::pair<bool, std::vector<LuaDiagnosisInfo>> LuaCodeFormat::Diagnose(const std::string& uri, std::string&& text)
+{
+	auto parser = LuaParser::LoadFromBuffer(std::move(text));
+	parser->BuildAstWithComment();
+
+	if (!parser->GetErrors().empty())
+	{
+		return std::make_pair(false, std::vector<LuaDiagnosisInfo>());
+	}
+	auto options = GetOptions(uri);
+	LuaFormatter formatter(parser, *options);
+	formatter.BuildFormattedElement();
+
+	return std::make_pair(true, formatter.GetDiagnosisInfos());
+}
+
 std::shared_ptr<LuaCodeStyleOptions> LuaCodeFormat::GetOptions(const std::string& uri)
 {
 	std::size_t matchLength = 0;

CodeFormatLib/src/LuaCodeFormat.h

@@ -5,6 +5,7 @@
 #include <string_view>
 
 #include "CodeService/LuaCodeStyleOptions.h"
+#include "CodeService/LuaDiagnosisInfo.h"
 #include "CodeService/LuaEditorConfig.h"
 #include "CodeService/LuaFormatRange.h"
 
@@ -20,7 +21,9 @@ 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::pair<bool, std::vector<LuaDiagnosisInfo>> Diagnose(const std::string& uri, std::string&& text);
 
 	std::shared_ptr<LuaCodeStyleOptions> GetOptions(const std::string& uri);
 private: