完整的支持 insert_final_newline

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -206,12 +206,6 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnFormatting(
 
 	auto result = std::make_shared<vscode::DocumentFormattingResult>();
 
-	if (totalLine == 0)
-	{
-		result->hasError = true;
-		return result;
-	}
-
 	auto options = LanguageClient::GetInstance().GetOptions(param->textDocument.uri);
 
 	if (parser->HasError())
@@ -344,6 +338,12 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 	auto formatResult = LanguageClient::GetInstance().GetService<CodeFormatService>()->RangeFormat(
 		formattedRange, parser, options);
 
+	auto totalLine = parser->GetTotalLine();
+	if(totalLine == position.line)
+	{
+		formatResult.push_back('\n');
+	}
+
 	auto& edit = result->edits.emplace_back();
 	edit.newText = std::move(formatResult);
 	edit.range = vscode::Range(

CodeService/src/FormatElement/SerializeContext.cpp

@@ -70,6 +70,23 @@ void SerializeContext::PrintBlank(int blank)
 
 std::string SerializeContext::GetText()
 {
+	if (!_options.insert_final_newline && !_buffer.empty())
+	{
+		std::size_t validSize = _buffer.size();
+		for (; validSize >= 1; validSize--)
+		{
+			char ch = _buffer[validSize - 1];
+			if (ch != '\r' && ch != '\n')
+			{
+				break;
+			}
+		}
+		if (validSize > 0 && validSize <= _buffer.size())
+		{
+			_buffer.resize(validSize);
+		}
+	}
+
 	return std::move(_buffer);
 }