修复索引表达式中特殊情况下的格式化问题

Author: CppCXY

CodeService/src/LuaFormatter.cpp

@@ -1618,21 +1618,21 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<Lu
 			}
 		case LuaAstNodeType::IndexOperator:
 			{
-				if(child->GetTokenType() == '[')
+				if (child->GetTokenType() == '[')
 				{
 					auto nextNode = NextNode(it, children);
-					if(nextNode && nextNode->GetType() == LuaAstNodeType::Expression)
+					if (nextNode && nextNode->GetType() == LuaAstNodeType::Expression
+						&& (StringUtil::StartWith(nextNode->GetText(), "[")
+							|| StringUtil::EndWith(nextNode->GetText(), "]"))
+					)
 					{
-						auto stringExpr = nextNode->FindFirstOf(LuaAstNodeType::StringLiteralExpression);
-						if (stringExpr && StringUtil::StartWith(stringExpr->GetText(), "[")) {
-							isIndexExprLongString = true;
-							env->Add<TextElement>(child);
-							env->Add<KeepElement>(1);
-							continue;
-						}
+						isIndexExprLongString = true;
+						env->Add<TextElement>(child);
+						env->Add<KeepElement>(1);
+						continue;
 					}
 				}
-				else if(child->GetTokenType() == ']' && isIndexExprLongString)
+				else if (child->GetTokenType() == ']' && isIndexExprLongString)
 				{
 					env->Add<KeepElement>(1);
 				}
@@ -2226,23 +2226,22 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIndexExpression(std::shared_p
 				{
 					expressionAfterIndexOperator = true;
 					auto nextNode = NextNode(it, children);
-					if (nextNode && nextNode->GetType() == LuaAstNodeType::Expression)
+					if (nextNode && nextNode->GetType() == LuaAstNodeType::Expression
+						&& (StringUtil::StartWith(nextNode->GetText(), "[")
+							|| StringUtil::EndWith(nextNode->GetText(), "]")))
 					{
-						auto stringExpr = nextNode->FindFirstOf(LuaAstNodeType::StringLiteralExpression);
-						if (stringExpr && StringUtil::StartWith(stringExpr->GetText(), "[")) {
-							isIndexExprLongString = true;
-							env->Add<TextElement>(child);
-							env->Add<KeepElement>(1);
-							continue;
-						}
+						isIndexExprLongString = true;
+						env->Add<TextElement>(child);
+						env->Add<KeepElement>(1);
+						continue;
 					}
 
 					env->Add<TextElement>(child);
 					env->Add<KeepElement>(0);
 				}
-				else if (child->GetTokenType() == ']' )
+				else if (child->GetTokenType() == ']')
 				{
-					env->Add<KeepElement>(isIndexExprLongString? 1:0);
+					env->Add<KeepElement>(isIndexExprLongString ? 1 : 0);
 					env->Add<TextElement>(child);
 					env->Add<KeepElement>(0);
 				}

Test/test_script/format_text/wait_format/.editorconfig

@@ -1,4 +1,5 @@
 
 # see https://github.com/CppCXY/EmmyLuaCodeStyle
 [*.lua]
-enable_check_codestyle = false
+enable_check_codestyle = false
+indent_style = space

Test/test_script/format_text/wait_format/expression.lua

@@ -25,6 +25,8 @@ function f()
         .fffff()
         .jjjjj()
     aaaa[ [[bbbb]] ] = 123
+    aaaa[ [[bbbbb]] + 1 ] = 456
+    aaaa[ ~ [[cccccc]] ] = 789
     local t = {
         aaa,bbbb,cccc
     }

Test/test_script/format_text/wait_format_should_be/expression.lua

@@ -25,6 +25,8 @@ function f()
         .fffff()
         .jjjjj()
     aaaa[ [[bbbb]] ] = 123
+    aaaa[ [[bbbbb]] + 1 ] = 456
+    aaaa[ ~[[cccccc]] ] = 789
     local t = {
         aaa, bbbb, cccc
     }