修复formatOnType问题

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -300,7 +300,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 
 	LuaFormatRange formatRange(static_cast<int>(param->range.start.line), static_cast<int>(param->range.end.line));
 	auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(
-		formatRange, parser, options);
+		formatRange, parser, *options);
 
 	auto& edit = result->edits.emplace_back();
 	edit.newText = std::move(formatResult);
@@ -332,17 +332,14 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 		return result;
 	}
 
+	LuaCodeStyleOptions tempOptions = *options;
+	tempOptions.insert_final_newline = true;
 
 	LuaFormatRange formattedRange(static_cast<int>(position.line) - 1, static_cast<int>(position.line) - 1);
 
 	auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(
-		formattedRange, parser, options);
+		formattedRange, parser, tempOptions);
 
-	auto totalLine = parser->GetTotalLine();
-	if(totalLine == position.line && !options->insert_final_newline)
-	{
-		formatResult.push_back('\n');
-	}
 
 	auto& edit = result->edits.emplace_back();
 	edit.newText = std::move(formatResult);

CodeFormatServer/src/Service/CodeFormatService.cpp

@@ -88,9 +88,9 @@ std::string CodeFormatService::Format(std::shared_ptr<LuaParser> parser, std::sh
 
 std::string CodeFormatService::RangeFormat(LuaFormatRange& range,
                                            std::shared_ptr<LuaParser> parser,
-                                           std::shared_ptr<LuaCodeStyleOptions> options)
+                                           LuaCodeStyleOptions& options)
 {
-	LuaFormatter formatter(parser, *options);
+	LuaFormatter formatter(parser, options);
 	formatter.BuildFormattedElement();
 	return formatter.GetRangeFormattedText(range);
 }

include/CodeFormatServer/Service/CodeFormatService.h

@@ -23,8 +23,7 @@ class CodeFormatService : public Service
 
 	std::string Format(std::shared_ptr<LuaParser> parser, std::shared_ptr<LuaCodeStyleOptions> options);
 
-	std::string RangeFormat(LuaFormatRange& range, std::shared_ptr<LuaParser> parser,
-	                        std::shared_ptr<LuaCodeStyleOptions> options);
+	std::string RangeFormat(LuaFormatRange& range, std::shared_ptr<LuaParser> parser, LuaCodeStyleOptions& options);
 
 	void LoadDictionary(std::string_view path);