限制typeformat

Author: CppCXY

CodeFormatLib/src/CodeFormatLib.cpp

@@ -210,8 +210,26 @@ int type_format(lua_State* L)
 					lua_pop(L, 1);
 				}
 			}
+
+			LuaCodeFormat::ConfigMap stringTypeOptions;
+			if (top == 6 && lua_istable(L, 6))
+			{
+				lua_pushnil(L);
+				while (lua_next(L, -2) != 0)
+				{
+					auto key = luaToString(L, -2);
+					auto value = luaToString(L, -1);
+
+					if (key != "nil")
+					{
+						stringTypeOptions.insert({ key, value });
+					}
+
+					lua_pop(L, 1);
+				}
+			}
 			auto typeFormat = LuaCodeFormat::GetInstance().TypeFormat(filename, line, character, std::move(text),
-			                                                          configMap);
+			                                                          configMap, stringTypeOptions);
 
 			if (!typeFormat.HasFormatResult())
 			{

CodeFormatLib/src/LuaCodeFormat.cpp

@@ -126,7 +126,7 @@ std::string LuaCodeFormat::RangeFormat(const std::string& uri, LuaFormatRange& r
 }
 
 LuaTypeFormat LuaCodeFormat::TypeFormat(const std::string& uri, int line, int character, std::string&& text,
-                                        ConfigMap& configMap)
+                                        ConfigMap& configMap, ConfigMap& stringTypeOptions)
 {
 	auto parser = LuaParser::LoadFromBuffer(std::move(text));
 	if (_customParser->IsSupportCustomTokens())
@@ -136,7 +136,8 @@ LuaTypeFormat LuaCodeFormat::TypeFormat(const std::string& uri, int line, int ch
 	parser->BuildAstWithComment();
 	auto options = GetOptions(uri);
 	auto tempOptions = CalculateOptions(uri, configMap);
-	LuaTypeFormat typeFormat(parser, tempOptions);
+	auto typeOptions = LuaTypeFormatOptions::ParseFrom(stringTypeOptions);
+	LuaTypeFormat typeFormat(parser, tempOptions, typeOptions);
 	typeFormat.Analysis("\n", line, character);
 
 	return typeFormat;

CodeFormatLib/src/LuaCodeFormat.h

@@ -9,7 +9,7 @@
 #include "CodeService/LuaEditorConfig.h"
 #include "CodeService/LuaFormatRange.h"
 #include "CodeService/Spell/CodeSpellChecker.h"
-#include "CodeService/LuaTypeFormat.h"
+#include "CodeService/TypeFormat/LuaTypeFormat.h"
 
 class LuaCodeFormat
 {
@@ -32,7 +32,8 @@ class LuaCodeFormat
 
 	std::string RangeFormat(const std::string& uri, LuaFormatRange& range, std::string&& text, ConfigMap& configMap);
 
-	LuaTypeFormat TypeFormat(const std::string& uri, int line, int character, std::string&& text, ConfigMap& configMap);
+	LuaTypeFormat TypeFormat(const std::string& uri, int line, int character, std::string&& text,
+	                         ConfigMap& configMap, ConfigMap& stringTypeOptions);
 
 	std::pair<bool, std::vector<LuaDiagnosisInfo>> Diagnose(const std::string& uri, std::string&& text);
 

CodeFormatServer/src/LanguageService.cpp

@@ -13,7 +13,7 @@
 #include "CodeFormatServer/Service/CommandService.h"
 #include "CodeFormatServer/Service/ModuleService.h"
 #include "CodeFormatServer/Service/CompletionService.h"
-#include "CodeService/LuaTypeFormat.h"
+#include "CodeService/TypeFormat/LuaTypeFormat.h"
 #include "Util/Url.h"
 #include "Util/format.h"
 #include "LuaParser/LuaIdentify.h"
@@ -320,7 +320,8 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 	auto position = param->position;
 
 	auto result = std::make_shared<vscode::DocumentFormattingResult>();
-	LuaTypeFormat typeFormat(parser, *options);
+	LuaTypeFormatOptions typeOptions;
+	LuaTypeFormat typeFormat(parser, *options, typeOptions);
 	typeFormat.Analysis("\n", position.line, position.character);
 
 	if(!typeFormat.HasFormatResult())

CodeService/CMakeLists.txt

@@ -34,8 +34,9 @@ target_sources(CodeService
 	${LuaCodeStyle_SOURCE_DIR}/include/CodeService/FormatElement/TextDefineType.h
 	PRIVATE
 	${CodeService_SOURCE_DIR}/src/LuaFormatter.cpp	
-	${CodeService_SOURCE_DIR}/src/LuaTypeFormat.cpp	
 
+	${CodeService_SOURCE_DIR}/src/TypeFormat/LuaTypeFormat.cpp	
+	${CodeService_SOURCE_DIR}/src/TypeFormat/LuaTypeFormatOptions.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/IndentElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/KeepLineElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/MinLineElement.cpp	

CodeService/src/LuaTypeFormat.cpp …Service/src/TypeFormat/LuaTypeFormat.cppCodeService/src/LuaTypeFormat.cpp renamed to CodeService/src/TypeFormat/LuaTypeFormat.cpp CodeService/src/LuaTypeFormat.cpp renamed to CodeService/src/TypeFormat/LuaTypeFormat.cpp

@@ -1,4 +1,4 @@
-#include "CodeService/LuaTypeFormat.h"
+#include "CodeService/TypeFormat/LuaTypeFormat.h"
 #include <algorithm>
 #include "LuaParser/LuaTokenTypeDetail.h"
 #include "CodeService/FormatElement/SerializeContext.h"
@@ -27,9 +27,11 @@ int FindTokenIndexBeforePosition(std::vector<LuaToken>& tokens, int offset)
 	return static_cast<int>(pos - tokens.begin()) - 1;
 }
 
-LuaTypeFormat::LuaTypeFormat(std::shared_ptr<LuaParser> luaParser, LuaCodeStyleOptions& options)
+LuaTypeFormat::LuaTypeFormat(std::shared_ptr<LuaParser> luaParser, LuaCodeStyleOptions& options,
+                             LuaTypeFormatOptions& typeOptions)
 	: _parser(luaParser),
 	  _options(options),
+	  _typeOptions(typeOptions),
 	  _hasResult(false)
 {
 }
@@ -84,6 +86,11 @@ void LuaTypeFormat::AnalysisReturn(int line, int character)
 
 void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaError)
 {
+	if(!_typeOptions.auto_complete_end)
+	{
+		return;
+	}
+
 	LuaCodeStyleOptions temp = _options;
 	temp.insert_final_newline = true;
 	switch (luaError.MissToken)
@@ -190,6 +197,11 @@ void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaErro
 
 void LuaTypeFormat::FormatLine(int line)
 {
+	if(!_typeOptions.format_line)
+	{
+		return;
+	}
+
 	LuaCodeStyleOptions temp = _options;
 	temp.insert_final_newline = true;
 	temp.remove_expression_list_finish_comma = false;
@@ -213,7 +225,7 @@ void LuaTypeFormat::FormatLine(int line)
 			break;
 		}
 	}
-	if(!formatText.empty() && formatText.back() != '\n')
+	if (!formatText.empty() && formatText.back() != '\n')
 	{
 		formatText.push_back('\n');
 	}

CodeService/src/TypeFormat/LuaTypeFormatOptions.cpp

@@ -0,0 +1,18 @@
+#include "CodeService/TypeFormat/LuaTypeFormatOptions.h"
+
+LuaTypeFormatOptions LuaTypeFormatOptions::ParseFrom(std::map<std::string, std::string, std::less<>>& stringOptions)
+{
+	LuaTypeFormatOptions options;
+
+	if(stringOptions.count("auto_complete_end"))
+	{
+		options.auto_complete_end = stringOptions["auto_complete_end"] == "true";
+	}
+
+	if(stringOptions.count("format_line"))
+	{
+		options.format_line = stringOptions["format_line"] == "true";
+	}
+
+	return options;
+}

include/CodeService/LuaTypeFormat.h …e/CodeService/TypeFormat/LuaTypeFormat.hinclude/CodeService/LuaTypeFormat.h renamed to include/CodeService/TypeFormat/LuaTypeFormat.h include/CodeService/LuaTypeFormat.h renamed to include/CodeService/TypeFormat/LuaTypeFormat.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "LuaFormatter.h"
-#include "LuaFormatRange.h"
+#include "CodeService/LuaFormatter.h"
+#include "CodeService/LuaFormatRange.h"
+#include "LuaTypeFormatOptions.h"
 
 class LuaTypeFormat
 {
@@ -14,7 +15,7 @@ class LuaTypeFormat
 	};
 
 
-	LuaTypeFormat(std::shared_ptr<LuaParser> luaParser, LuaCodeStyleOptions& options);
+	LuaTypeFormat(std::shared_ptr<LuaParser> luaParser, LuaCodeStyleOptions& options, LuaTypeFormatOptions& typeOptions);
 	~LuaTypeFormat() = default;
 
 	void Analysis(std::string_view trigger, int line, int character);
@@ -30,6 +31,7 @@ class LuaTypeFormat
 
 	std::shared_ptr<LuaParser> _parser;
 	LuaCodeStyleOptions& _options;
+	LuaTypeFormatOptions& _typeOptions;
 	bool _hasResult;
 	Result _result;
 };

include/CodeService/TypeFormat/LuaTypeFormatOptions.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+class LuaTypeFormatOptions
+{
+public:
+	static LuaTypeFormatOptions ParseFrom(std::map<std::string, std::string, std::less<>>& stringOptions);
+
+	bool format_line = true;
+	bool auto_complete_end = true;
+};