格式化算法支持namedef和attribute保持一个空格

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -206,6 +206,12 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("keep_one_space_between_table_and_bracket") == "true";
 	}
 
+	if(configMap.count("keep_one_space_between_namedef_and_attribute"))
+	{
+		options->keep_one_space_between_namedef_and_attribute =
+			configMap.at("keep_one_space_between_namedef_and_attribute") == "true";
+	}
+
 	if (configMap.count("align_table_field_to_first_field"))
 	{
 		options->align_table_field_to_first_field = configMap.at("align_table_field_to_first_field") == "true";

CodeService/src/LuaFormatter.cpp

@@ -395,7 +395,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatLocalStatement(std::shared_pt
 				}
 
 				env->Add<TextElement>(node);
-				env->Add<KeepBlankElement>(1);
+				env->Add<KeepElement>(1);
 				break;
 			}
 		case LuaAstNodeType::NameDefList:
@@ -477,7 +477,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNameDefList(std::shared_ptr<L
 		{
 		case LuaAstNodeType::Identify:
 			{
-				env->Add<TextElement>(node, TextDefineType::LocalNameDefine);
+				env->Add<TextElement>(node);
 				break;
 			}
 		case LuaAstNodeType::GeneralOperator:
@@ -492,6 +492,16 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNameDefList(std::shared_ptr<L
 				env->Add<KeepElement>(1);
 				break;
 			}
+		case LuaAstNodeType::Attribute:
+			{
+				if(_options.keep_one_space_between_namedef_and_attribute)
+				{
+					env->Add<KeepBlankElement>(1);
+				}
+
+				env->AddChild(FormatNode(node));
+				break;
+			}
 		default:
 			DefaultHandle(node, env);
 			break;
@@ -1000,12 +1010,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatExpressionStatement(std::shar
 				env->AddChild(FormatNode(child));
 				break;
 			}
-		// case LuaAstNodeType::Expression:
-		// 	{
-		// 		FormatExpression(child, env);
-		// 		break;
-		// 	}
-		// default 一般只有一个分号
+			// case LuaAstNodeType::Expression:
+			// 	{
+			// 		FormatExpression(child, env);
+			// 		break;
+			// 	}
+			// default 一般只有一个分号
 		default:
 			{
 				DefaultHandle(child, env);

include/CodeService/LuaCodeStyleOptions.h

@@ -63,6 +63,11 @@ class LuaCodeStyleOptions
 	 */
 	bool keep_one_space_between_table_and_bracket = true;
 
+	/*
+	 * 设定namedef 和 他的attribute之间是否间距一个空格
+	 */
+	bool keep_one_space_between_namedef_and_attribute = false;
+
 	/*
 	 * 既然大佬们觉得不好那就不开放选项的设置
 	 */

lua.template.editorconfig

@@ -13,6 +13,7 @@ keep_one_space_between_call_args_and_bracket = false
 align_function_define_params = true
 keep_one_space_between_table_and_bracket = true
 align_table_field_to_first_field = true
+keep_one_space_between_namedef_and_attribute = false
 continuous_assign_statement_align_to_equal_sign = true
 continuous_assign_table_field_align_to_equal_sign = true
 # optional crlf/lf