t[t[1]] 不再格式化为t[ t[1] ]

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -400,7 +400,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChangeWatchedFiles(
 	return nullptr;
 }
 
-//@depreacated
+//@deprecated
 std::shared_ptr<vscode::CompletionList> LanguageService::OnCompletion(std::shared_ptr<vscode::CompletionParams> param)
 {
 	auto list = std::make_shared<vscode::CompletionList>();

CodeFormatServer/src/Service/CommandService.cpp

@@ -124,7 +124,7 @@ void CommandService::Import(std::shared_ptr<vscode::ExecuteCommandParams> param)
 
 	std::string requireString = Util::format("local {} = {}(\"{}\")\n", moduleDefineName, config->import_function,
 	                                         moduleName);
-	auto parser = LanguageClient::GetInstance().GetFileParser(uri);
+	auto parser = _owner->GetFileParser(uri);
 	auto applyParams = std::make_shared<vscode::ApplyWorkspaceEditParams>();
 	auto it = applyParams->edit.changes.emplace(uri, std::vector<vscode::TextEdit>());
 	auto& change = it.first->second;
@@ -133,9 +133,9 @@ void CommandService::Import(std::shared_ptr<vscode::ExecuteCommandParams> param)
 
 	edit.newText = requireString;
 
-	edit.range = LanguageClient::GetInstance().GetService<ModuleService>()->FindRequireRange(parser, config);
+	edit.range = GetService<ModuleService>()->FindRequireRange(parser, config);
 
-	LanguageClient::GetInstance().SendRequest("workspace/applyEdit", applyParams);
+	_owner->SendRequest("workspace/applyEdit", applyParams);
 }
 
 void CommandService::SpellCorrect(std::shared_ptr<vscode::ExecuteCommandParams> param)
@@ -157,7 +157,7 @@ void CommandService::SpellCorrect(std::shared_ptr<vscode::ExecuteCommandParams>
 
 	edit.range = range;
 
-	LanguageClient::GetInstance().SendRequest("workspace/applyEdit", applyParams);
+	_owner->SendRequest("workspace/applyEdit", applyParams);
 }
 
 // void CommandService::SpellAddDict(std::shared_ptr<vscode::ExecuteCommandParams> param)

CodeService/src/AstUtil.cpp

@@ -263,3 +263,24 @@ std::shared_ptr<LuaAstNode> ast_util::FindLeftIndexExpression(std::shared_ptr<Lu
 
 	return leftIndex;
 }
+
+bool ast_util::WillIndexExpressionFormatError(std::shared_ptr<LuaAstNode> expression)
+{
+	auto text = expression->GetText();
+	if(text.empty())
+	{
+		return false;
+	}
+
+	if(text.front() == '[')
+	{
+		return text.length() > 2 && (text[1] == '[' || text[1] == '=');
+	}
+
+	if(text.back() == ']')
+	{
+		return text.length() > 2 && (text[text.length() - 2] == ']' || text[text.length() - 2] == '=');
+	}
+
+	return false;
+}

CodeService/src/LuaFormatter.cpp

@@ -1622,9 +1622,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<Lu
 				{
 					auto nextNode = NextNode(it, children);
 					if (nextNode && nextNode->GetType() == LuaAstNodeType::Expression
-						&& (StringUtil::StartWith(nextNode->GetText(), "[")
-							|| StringUtil::EndWith(nextNode->GetText(), "]"))
-					)
+						&& ast_util::WillIndexExpressionFormatError(nextNode))
 					{
 						isIndexExprLongString = true;
 						env->Add<TextElement>(child);
@@ -2227,8 +2225,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIndexExpression(std::shared_p
 					expressionAfterIndexOperator = true;
 					auto nextNode = NextNode(it, children);
 					if (nextNode && nextNode->GetType() == LuaAstNodeType::Expression
-						&& (StringUtil::StartWith(nextNode->GetText(), "[")
-							|| StringUtil::EndWith(nextNode->GetText(), "]")))
+						&& ast_util::WillIndexExpressionFormatError(nextNode))
 					{
 						isIndexExprLongString = true;
 						env->Add<TextElement>(child);

include/CodeService/AstUtil.h

@@ -16,4 +16,6 @@ namespace ast_util
 	bool WillCallArgHaveParentheses(std::shared_ptr<LuaAstNode> callArgList, CallArgParentheses callArgParentheses);
 
 	std::shared_ptr<LuaAstNode> FindLeftIndexExpression(std::shared_ptr<LuaAstNode> expression);
+
+	bool WillIndexExpressionFormatError(std::shared_ptr<LuaAstNode> expression);
 }