支持修改对默认配置的支持

Author: CppCXY

CodeFormatLib/src/CodeFormatLib.cpp

@@ -234,22 +234,60 @@ int diagnose_file(lua_State* L)
 	return 0;
 }
 
+std::string luaToString(lua_State* L, int idx)
+{
+	if (lua_isstring(L, idx))
+	{
+		return lua_tostring(L, idx);
+	}
+	else if (lua_isinteger(L, idx))
+	{
+		return std::to_string(lua_tointeger(L, idx));
+	}
+	else if (lua_isnumber(L, idx))
+	{
+		return std::to_string(lua_tonumber(L, idx));
+	}
+	else if (lua_isboolean(L, idx))
+	{
+		return std::to_string(static_cast<bool>(lua_toboolean(L, idx)));
+	}
+	else
+	{
+		return "nil";
+	}
+}
 
 int set_default_config(lua_State* L)
 {
 	int top = lua_gettop(L);
 
-	if (top < 1)
+	if (top != 1)
 	{
 		return 0;
 	}
 
-	if (lua_isstring(L, 1))
+	if (lua_istable(L, 1))
 	{
 		try
 		{
-			std::string configPath = lua_tostring(L, 1);
-			LuaCodeFormat::GetInstance().SetDefaultCodeStyle(configPath);
+			std::map<std::string, std::string, std::less<>> configMap;
+
+			lua_pushnil(L);
+			while (lua_next(L, - 2) != 0)
+			{
+				auto key = luaToString(L, -2);
+				auto value = luaToString(L, -1);
+
+				if (key != "nil")
+				{
+					configMap.insert({key, value});
+				}
+
+				lua_pop(L, 1);
+			}
+
+			LuaCodeFormat::GetInstance().SetDefaultCodeStyle(configMap);
 			lua_pushboolean(L, true);
 			return 1;
 		}

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -53,18 +53,11 @@ void LuaCodeFormat::RemoveCodeStyle(const std::string& workspaceUri)
 	}
 }
 
-void LuaCodeFormat::SetDefaultCodeStyle(const std::string& configPath)
+void LuaCodeFormat::SetDefaultCodeStyle(std::map<std::string, std::string, std::less<>>& configMap)
 {
-	auto editorconfig = LuaEditorConfig::LoadFromFile(configPath);
-	if (editorconfig == nullptr)
-	{
-		return;
-	}
-
-	auto defaultCodeStyle = editorconfig->Generate("");
-	if (defaultCodeStyle)
+	if (!configMap.empty())
 	{
-		_defaultOptions = defaultCodeStyle;
+		LuaEditorConfig::ParseFromSection(_defaultOptions, configMap);
 	}
 }
 

CodeFormatLib/src/LuaCodeFormat.h

@@ -18,7 +18,7 @@ class LuaCodeFormat
 
 	void UpdateCodeStyle(const std::string& workspaceUri, const std::string& configPath);
 	void RemoveCodeStyle(const std::string& workspaceUri);
-	void SetDefaultCodeStyle(const std::string& configPath);
+	void SetDefaultCodeStyle(std::map<std::string, std::string, std::less<>>& configMap);
 
 	std::string Reformat(const std::string& uri, std::string&& text);
 

include/CodeService/LuaEditorConfig.h

@@ -16,6 +16,9 @@ class LuaEditorConfig
 
 	static std::shared_ptr<LuaEditorConfig> LoadFromFile(const std::string& path);
 
+	static void ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> options,
+	                             std::map<std::string, std::string, std::less<>>& configMap);
+
 	LuaEditorConfig(std::string&& source);
 
 	void Parse();
@@ -25,10 +28,7 @@ class LuaEditorConfig
 	void SetWorkspace(std::string_view workspace);
 
 	void SetRootWorkspace(std::string_view rootWorkspace);
-private:                        
-	void ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> options,
-	                      std::map<std::string, std::string, std::less<>>& configMap);
-
+private:
 	std::string _workspace;
 	std::string _rootWorkspace;
 	std::string _source;