修改文件编码为UTF8

CppCXY · CppCXY · commit a867804e3ff8 · 2021-12-03T14:23:01.000+08:00
diff --git a/CodeFormatServer/src/LanguageService.cpp b/CodeFormatServer/src/LanguageService.cpp
@@ -207,7 +207,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 	formatter.BuildFormattedElement();
 
 	auto& edit = result->edits.emplace_back();
-	LuaFormatRange formattedRange(param->range.start.line, param->range.end.line);
+	LuaFormatRange formattedRange(static_cast<int>(param->range.start.line), static_cast<int>(param->range.end.line));
 
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
@@ -224,7 +224,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 	auto position = param->position;
 
 	auto result = std::make_shared<vscode::DocumentFormattingResult>();
-	if (parser->IsEmptyLine(position.line - 1))
+	if (parser->IsEmptyLine(static_cast<int>(position.line) - 1))
 	{
 		result->hasError = true;
 		return result;
@@ -242,7 +242,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 	formatter.BuildFormattedElement();
 
 	auto& edit = result->edits.emplace_back();
-	LuaFormatRange formattedRange(position.line - 1, position.line - 1);
+	LuaFormatRange formattedRange(static_cast<int>(position.line) - 1, static_cast<int>(position.line) - 1);
 
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
diff --git a/CodeService/src/FormatElement/AlignmentLayoutElement.cpp b/CodeService/src/FormatElement/AlignmentLayoutElement.cpp
@@ -1,4 +1,4 @@
-#include "CodeService/FormatElement/AlignmentLayoutElement.h"
+﻿#include "CodeService/FormatElement/AlignmentLayoutElement.h"
 #include "CodeService/FormatElement/StatementElement.h"
 #include "CodeService/FormatElement/TextElement.h"
 #include "CodeService/FormatElement/AlignmentElement.h"
@@ -53,9 +53,9 @@ int AlignmentLayoutElement::getAlignPosition(std::shared_ptr<LuaParser> luaParse
 {
 	int eqAlignedPosition = 0;
 	bool firstContainEq = true;
-	// ��Ѱ�ҵȺŶ����λ�ã������ж������Ĵ��Ⱥŵ�����Ƿ�Ӧ�ö��뵽�Ⱥ�
-	// �����Ĵ��Ⱥŵ�����Ƿ�Ӧ�ö��뵽�Ⱥţ������ΪӦ���������������о���
-	// ������ӽڵ��ڵ�������乲ͬ��������ѽ��������뻹ԭΪ��ͨ�Ű�
+	// 先寻找等号对齐的位置，并且判断连续的带等号的语句是否应该对齐到等号
+	// 连续的带等号的语句是否应该对齐到等号，这个行为应该由连续语句的首行决定
+	// 如果被子节点内的其他语句共同决定则很难将连续对齐还原为普通排版
 	for (int statIndex = 0; statIndex != static_cast<int>(_children.size()); statIndex++)
 	{
 		auto statChild = _children[statIndex];
@@ -115,7 +115,7 @@ void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position
 				auto textElement = std::dynamic_pointer_cast<TextElement>(textChild);
 				if (textElement->GetText() == "=" && i > 0)
 				{
-					// ������Ԫ�ر��Ϊ����Ԫ��
+					// 将控制元素变更为对齐元素
 					statChildren[i - 1] = std::make_shared<AlignmentElement>(eqPosition);
 					break;
 				}
@@ -141,7 +141,7 @@ void AlignmentLayoutElement::alignmentDiagnosis(DiagnosisContext& ctx, int posit
 				auto textElement = std::dynamic_pointer_cast<TextElement>(textChild);
 				if (textElement->GetText() == "=" && i > 0)
 				{
-					// ������Ԫ�ر��Ϊ����Ԫ��
+					// 将控制元素变更为对齐元素
 					statChildren[i - 1] = std::make_shared<AlignmentElement>(eqPosition);
 					break;
 				}
diff --git a/CodeService/src/FormatElement/DiagnosisContext.cpp b/CodeService/src/FormatElement/DiagnosisContext.cpp
@@ -1,5 +1,4 @@
-#include "CodeService/FormatElement/DiagnosisContext.h"
-
+﻿#include "CodeService/FormatElement/DiagnosisContext.h"
 #include "CodeService/LanguageTranslator.h"
 #include "Util/format.h"
 
@@ -31,7 +30,7 @@ void DiagnosisContext::AddIndent(int specialIndent)
 		}
 		_indentStack.push(newIndent);
 	}
-	else //����㷨���ܻ�������
+	else //这个算法可能会有问题
 	{
 		int newIndent = 0;
 		if (specialIndent == -1)
@@ -43,13 +42,13 @@ void DiagnosisContext::AddIndent(int specialIndent)
 			}
 
 			auto& topIndent = _indentStack.top();
-			// һ��ֻ��һ��\t
+			// 一次只增一个\t
 			newIndent = 1 + topIndent;
 		}
 		else
 		{
-			// �һ���Ϊ����һ������
-			// �����ƶ���һ�����������һ���Ϊ������һ������
+			// 我会认为存在一个换算
+			// 当你制定了一个缩进，则我会认为保底有一个缩进
 			newIndent = std::max(1, specialIndent / 8);
 		}
 		_indentStack.push(newIndent);
diff --git a/CodeService/src/FormatElement/FormatContext.cpp b/CodeService/src/FormatElement/FormatContext.cpp
@@ -1,4 +1,4 @@
-#include "CodeService/FormatElement/FormatContext.h"
+﻿#include "CodeService/FormatElement/FormatContext.h"
 #include "CodeService/FormatElement/TextElement.h"
 
 FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaCodeStyleOptions& options)
@@ -44,7 +44,7 @@ void FormatContext::PrintBlank(int blank)
 
 void FormatContext::PrintIndent(int indent, const std::string& indentString)
 {
-	// ��ʼ����Ϊʹ\t���Ű��������
+	// 我始终认为使\t来排版就是垃圾
 	for (int i = 0; i < indent; i++)
 	{
 		_os << indentString;
@@ -74,7 +74,7 @@ void FormatContext::AddIndent(int specialIndent)
 		}
 		_indentStack.push({newIndent, " "});
 	}
-	else //����㷨���ܻ�������
+	else //这个算法可能会有问题
 	{
 		int newIndent = 0;
 		if (specialIndent == -1)
@@ -86,13 +86,13 @@ void FormatContext::AddIndent(int specialIndent)
 			}
 
 			auto& topIndent = _indentStack.top();
-			// һ��ֻ��һ��\t
+			// 一次只增一个\t
 			newIndent = 1 + topIndent.Indent;
 		}
 		else
 		{
-			// �һ���Ϊ����һ������
-			// �����ƶ���һ�����������һ���Ϊ������һ������
+			// 我会认为存在一个换算
+			// 当你制定了一个缩进，则我会认为保底有一个缩进
 			newIndent = std::max(1, specialIndent / 8);
 		}
 		std::string indentString = "\t";
diff --git a/CodeService/src/FormatElement/FormatElement.cpp b/CodeService/src/FormatElement/FormatElement.cpp
@@ -1,4 +1,4 @@
-#include "CodeService/FormatElement/FormatElement.h"
+﻿#include "CodeService/FormatElement/FormatElement.h"
 
 FormatElement::FormatElement(TextRange range)
 	: _textRange(range)
@@ -149,6 +149,6 @@ int FormatElement::getLastValidOffset(int position, FormatElement& parent)
 		}
 	}
 
-	// ��ôһ���������Ҳ�����Ч��ΧԪ��
+	// 那么一定是往上找不到有效范围元素
 	return parent.GetTextRange().StartOffset;
 }
diff --git a/CodeService/src/FormatElement/KeepElement.cpp b/CodeService/src/FormatElement/KeepElement.cpp
@@ -1,4 +1,4 @@
-#include "CodeService/FormatElement/KeepElement.h"
+﻿#include "CodeService/FormatElement/KeepElement.h"
 #include "Util/format.h"
 
 KeepElement::KeepElement(int keepBlank, bool hasLinebreak)
@@ -21,7 +21,7 @@ void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement& par
 	{
 		return;
 	}
-	// �����������˼�������һ��Ԫ�غ���һ��Ԫ��û��ʵ�ʵĻ����򱣳�һ���Ŀո�
+	// 这个条件的意思是如果上一个元素和下一个元素没有实质的换行则保持一定的空格
 	if (nextElementLine == lastElementLine && ctx.GetCharacterCount() != 0)
 	{
 		ctx.PrintBlank(_keepBlank);
diff --git a/CodeService/src/FormatElement/RangeFormatContext.cpp b/CodeService/src/FormatElement/RangeFormatContext.cpp
@@ -76,7 +76,7 @@ std::string RangeFormatContext::GetText()
 {
 	std::string formattedText = FormatContext::GetText();
 
-	for (int i = formattedText.size() - 1; i >= 0; i--)
+	for (int i = static_cast<int>(formattedText.size()) - 1; i >= 0; i--)
 	{
 		char ch = formattedText[i];
 
diff --git a/LuaParser/src/LuaTokenParser.cpp b/LuaParser/src/LuaTokenParser.cpp
@@ -169,7 +169,7 @@ int LuaTokenParser::GetColumn(int offset)
 
 	int bytesLength = offset - lineStartOffset;
 
-	int utf8Length = ::utf8nlen(_source.data() + lineStartOffset, bytesLength);
+	int utf8Length = ::utf8nlen(_source.data() + lineStartOffset, static_cast<std::size_t>(bytesLength));
 	return utf8Length;
 }
 
@@ -188,7 +188,7 @@ bool LuaTokenParser::IsEmptyLine(int line)
 	int nextLineStartOffset = 0;
 	if (line == _linenumber)
 	{
-		nextLineStartOffset = _source.size();
+		nextLineStartOffset = static_cast<int>(_source.size());
 	}
 	else
 	{
diff --git a/Test/src/CodeFormatTest.cpp b/Test/src/CodeFormatTest.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+﻿#include <cassert>
 #include <iostream>
 #include <filesystem>
 #include <vector>
@@ -109,7 +109,7 @@ std::string ReadFile(const std::string& path)
 	return "";
 }
 
-// ��һ�������Ǵ���ʽ���ı�Ŀ¼���ڶ��������Ǹ�ʽ��Ԥ�ڽ��
+// 第一个参数是待格式化文本目录，第二个参数是格式化预期结果
 int main(int argc, char* argv[])
 {
 	CommandLine commandLine;
diff --git a/include/CodeFormatServer/LanguageClient.h b/include/CodeFormatServer/LanguageClient.h
@@ -1,9 +1,10 @@
-#pragma once
+﻿#pragma once
 
 #include <memory>
 #include "Session/IOSession.h"
 #include "CodeService/LuaCodeStyleOptions.h"
 #include "LuaParser/LuaParser.h"
+
 class LanguageClient
 {
 public:
@@ -34,7 +35,7 @@ class LanguageClient
 	void RemoveOptions(std::string_view workspaceUri);
 private:
 	std::shared_ptr<IOSession> _session;
-	// uri ��file ast��ӳ��
+	// uri 到file ast的映射
 	std::map<std::string, std::shared_ptr<LuaParser>, std::less<>> _fileMap;
 
 	std::vector<std::pair<std::string, std::shared_ptr<LuaCodeStyleOptions>>> _optionsVector;
diff --git a/include/CodeFormatServer/Protocol/ProtocolBuffer.h b/include/CodeFormatServer/Protocol/ProtocolBuffer.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include <string>
 
@@ -20,7 +20,7 @@ class ProtocolBuffer
 	void Reset();
 private:
 	bool TryParseHead();
-	// ���������λ�ÿ�ʼ��д
+	// 代表从这个位置开始可写
 	std::size_t _writeIndex;
 	std::string _textProtocol;
 
diff --git a/include/CodeFormatServer/VSCode.h b/include/CodeFormatServer/VSCode.h
@@ -1,10 +1,10 @@
-#pragma once
+﻿#pragma once
 #include <cstdint>
 #include <string>
 #include <vector>
 
 #include <nlohmann/json.hpp>
-// ��������vscodeһ��
+// 命名风格和vscode一样
 
 namespace vscode
 {
@@ -167,7 +167,7 @@ class InitializeParams : public Serializable
 	std::string locale;
 
 	InitializationOptions initializationOptions;
-	// ������������
+	// 其他参数忽略
 	void Deserialize(nlohmann::json json) override;
 };
 
@@ -225,7 +225,7 @@ class DocumentFormattingParams : public Serializable
 	void Deserialize(nlohmann::json json) override;
 };
 
-// ���ಢ��language server protocol �ӿ�
+// 该类并非language server protocol 接口
 class DocumentFormattingResult : public Serializable
 {
 public:
diff --git a/include/CodeService/LanguageTranslator.h b/include/CodeService/LanguageTranslator.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include <string>
 #include <map>
@@ -19,7 +19,7 @@ class LanguageTranslator
 };
 
 /*
- * ���Ա��ػ�����ʵ��������һ�ֹ��÷�
+ * 语言本地化翻译实例，保持一种惯用法
  */
 #define LText(text) LanguageTranslator::GetInstance().Get(text)
 
diff --git a/include/LuaParser/LuaAstNode.h b/include/LuaParser/LuaAstNode.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include <string_view>
 #include <vector>
@@ -28,7 +28,7 @@ class LuaAstNode
 
 	void SetType(LuaAstNodeType type);
 
-	// child�ᱻ����Ϊ��ײ��Ҷ�ӽڵ�
+	// child会被加入为最底层的叶子节点
 	void AddLeafChild(std::shared_ptr<LuaAstNode> child);
 private:
 	void addChildAfter(int index, std::shared_ptr<LuaAstNode> child);
diff --git a/include/LuaParser/LuaOperatorType.h b/include/LuaParser/LuaOperatorType.h
@@ -1,6 +1,6 @@
-#pragma once
+﻿#pragma once
 
-// ȡ��������lua Դ����
+// 取名都来自lua 源代码
 enum class UnOpr
 {
 	OPR_MINUS,
diff --git a/include/LuaParser/LuaParser.h b/include/LuaParser/LuaParser.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include <memory>
 #include "LuaTokenParser.h"
@@ -109,7 +109,7 @@ class LuaParser
 
 	void functionCallArgs(std::shared_ptr<LuaAstNode>& expressionNode);
 
-	// �ú�����ı����
+	// 该函数会改变入参
 	void fieldSel(std::shared_ptr<LuaAstNode>& expressionNode);
 
 	void yIndex(std::shared_ptr<LuaAstNode> expressionNode);
@@ -129,17 +129,17 @@ class LuaParser
 	BinOpr getBinaryOperator(LuaTokenType op);
 
 	/*
-	 * ���Ǽ�鵱ǰtoken��type�Ƿ���c��ͬ
-	 * ����Ǿ�������ǰ,
-	 * ��������ɴ���
+	 * 他是检查当前token的type是否与c相同
+	 * 如果是就跳过当前,
+	 * 否则会生成错误
 	 */
 	void checkAndNext(LuaTokenType c, std::shared_ptr<LuaAstNode> parent,
 	                  LuaAstNodeType addType = LuaAstNodeType::KeyWord);
 
 	/*
-	 * ���Ǽ�鵱ǰtoken��type�Ƿ���c��ͬ
-	 * ����Ǿ�������ǰ��������true
-	 * ���򷵻�false
+	 * 他是检查当前token的type是否与c相同
+	 * 如果是就跳过当前，并返回true
+	 * 否则返回false
 	 */
 	bool testNext(LuaTokenType c, std::shared_ptr<LuaAstNode> parent, LuaAstNodeType addType = LuaAstNodeType::KeyWord);
 
diff --git a/include/LuaParser/LuaTokenParser.h b/include/LuaParser/LuaTokenParser.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include <map>
 #include <string_view>
@@ -10,7 +10,7 @@
 #include "LuaTokenType.h"
 
 /*
- * token ����������lua Դ����,ʵ���Ϸǳ��ӽ���ϸ�ڴ�������ͬ
+ * token 解析来自于lua 源代码,实现上非常接近但细节处并不相同
  */
 class LuaTokenParser
 {
@@ -91,7 +91,7 @@ class LuaTokenParser
 	std::string _source;
 
 	std::vector<LuaToken> _tokens;
-	// ע�͵�������
+	// 注释单独处理
 	std::vector<LuaToken> _commentTokens;
 
 	std::vector<LuaError> _errors;
diff --git a/include/Util/CommandLine.h b/include/Util/CommandLine.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "CodeService/FormatElement/AlignmentLayoutElement.h"`
	`1`	`+#include "CodeService/FormatElement/AlignmentLayoutElement.h"`
`2`	`2`	`#include "CodeService/FormatElement/StatementElement.h"`
`3`	`3`	`#include "CodeService/FormatElement/TextElement.h"`
`4`	`4`	`#include "CodeService/FormatElement/AlignmentElement.h"`
`@@ -53,9 +53,9 @@ int AlignmentLayoutElement::getAlignPosition(std::shared_ptr<LuaParser> luaParse`
`53`	`53`	`{`
`54`	`54`	`int eqAlignedPosition = 0;`
`55`	`55`	`bool firstContainEq = true;`
`56`		`- // 先寻找等号对齐的位置，并且判断连续的带等号的语句是否应该对齐到等号`
`57`		`- // 连续的带等号的语句是否应该对齐到等号，这个行为应该由连续语句的首行决定`
`58`		`- // 如果被子节点内的其他语句共同决定则很难将连续对齐还原为普通排版`
	`56`	`+ // 先寻找等号对齐的位置，并且判断连续的带等号的语句是否应该对齐到等号`
	`57`	`+ // 连续的带等号的语句是否应该对齐到等号，这个行为应该由连续语句的首行决定`
	`58`	`+ // 如果被子节点内的其他语句共同决定则很难将连续对齐还原为普通排版`
`59`	`59`	`for (int statIndex = 0; statIndex != static_cast<int>(_children.size()); statIndex++)`
`60`	`60`	`{`
`61`	`61`	`auto statChild = _children[statIndex];`
`@@ -115,7 +115,7 @@ void AlignmentLayoutElement::alignmentSerialize(FormatContext& ctx, int position`
`115`	`115`	`auto textElement = std::dynamic_pointer_cast<TextElement>(textChild);`
`116`	`116`	`if (textElement->GetText() == "=" && i > 0)`
`117`	`117`	`{`
`118`		`- // 将控制元素变更为对齐元素`
	`118`	`+ // 将控制元素变更为对齐元素`
`119`	`119`	`statChildren[i - 1] = std::make_shared<AlignmentElement>(eqPosition);`
`120`	`120`	`break;`
`121`	`121`	`}`
`@@ -141,7 +141,7 @@ void AlignmentLayoutElement::alignmentDiagnosis(DiagnosisContext& ctx, int posit`
`141`	`141`	`auto textElement = std::dynamic_pointer_cast<TextElement>(textChild);`
`142`	`142`	`if (textElement->GetText() == "=" && i > 0)`
`143`	`143`	`{`
`144`		`- // 将控制元素变更为对齐元素`
	`144`	`+ // 将控制元素变更为对齐元素`
`145`	`145`	`statChildren[i - 1] = std::make_shared<AlignmentElement>(eqPosition);`
`146`	`146`	`break;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-#include "CodeService/FormatElement/DiagnosisContext.h"`
`2`		`-`
	`1`	`+#include "CodeService/FormatElement/DiagnosisContext.h"`
`3`	`2`	`#include "CodeService/LanguageTranslator.h"`
`4`	`3`	`#include "Util/format.h"`
`5`	`4`
`@@ -31,7 +30,7 @@ void DiagnosisContext::AddIndent(int specialIndent)`
`31`	`30`	`}`
`32`	`31`	`_indentStack.push(newIndent);`
`33`	`32`	`}`
`34`		`- else //这个算法可能会有问题`
	`33`	`+ else //这个算法可能会有问题`
`35`	`34`	`{`
`36`	`35`	`int newIndent = 0;`
`37`	`36`	`if (specialIndent == -1)`
`@@ -43,13 +42,13 @@ void DiagnosisContext::AddIndent(int specialIndent)`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`auto& topIndent = _indentStack.top();`
`46`		`- // 一次只增一个\t`
	`45`	`+ // 一次只增一个\t`
`47`	`46`	`newIndent = 1 + topIndent;`
`48`	`47`	`}`
`49`	`48`	`else`
`50`	`49`	`{`
`51`		`- // 我会认为存在一个换算`
`52`		`- // 当你制定了一个缩进，则我会认为保底有一个缩进`
	`50`	`+ // 我会认为存在一个换算`
	`51`	`+ // 当你制定了一个缩进，则我会认为保底有一个缩进`
`53`	`52`	`newIndent = std::max(1, specialIndent / 8);`
`54`	`53`	`}`
`55`	`54`	`_indentStack.push(newIndent);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "CodeService/FormatElement/FormatContext.h"`
	`1`	`+#include "CodeService/FormatElement/FormatContext.h"`
`2`	`2`	`#include "CodeService/FormatElement/TextElement.h"`
`3`	`3`
`4`	`4`	`FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaCodeStyleOptions& options)`
`@@ -44,7 +44,7 @@ void FormatContext::PrintBlank(int blank)`
`44`	`44`
`45`	`45`	`void FormatContext::PrintIndent(int indent, const std::string& indentString)`
`46`	`46`	`{`
`47`		`- // 我始终认为使\t来排版就是垃圾`
	`47`	`+ // 我始终认为使\t来排版就是垃圾`
`48`	`48`	`for (int i = 0; i < indent; i++)`
`49`	`49`	`{`
`50`	`50`	`_os << indentString;`
`@@ -74,7 +74,7 @@ void FormatContext::AddIndent(int specialIndent)`
`74`	`74`	`}`
`75`	`75`	`_indentStack.push({newIndent, " "});`
`76`	`76`	`}`
`77`		`- else //这个算法可能会有问题`
	`77`	`+ else //这个算法可能会有问题`
`78`	`78`	`{`
`79`	`79`	`int newIndent = 0;`
`80`	`80`	`if (specialIndent == -1)`
`@@ -86,13 +86,13 @@ void FormatContext::AddIndent(int specialIndent)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`auto& topIndent = _indentStack.top();`
`89`		`- // 一次只增一个\t`
	`89`	`+ // 一次只增一个\t`
`90`	`90`	`newIndent = 1 + topIndent.Indent;`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
`94`		`- // 我会认为存在一个换算`
`95`		`- // 当你制定了一个缩进，则我会认为保底有一个缩进`
	`94`	`+ // 我会认为存在一个换算`
	`95`	`+ // 当你制定了一个缩进，则我会认为保底有一个缩进`
`96`	`96`	`newIndent = std::max(1, specialIndent / 8);`
`97`	`97`	`}`
`98`	`98`	`std::string indentString = "\t";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "CodeService/FormatElement/KeepElement.h"`
	`1`	`+#include "CodeService/FormatElement/KeepElement.h"`
`2`	`2`	`#include "Util/format.h"`
`3`	`3`
`4`	`4`	`KeepElement::KeepElement(int keepBlank, bool hasLinebreak)`
`@@ -21,7 +21,7 @@ void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement& par`
`21`	`21`	`{`
`22`	`22`	`return;`
`23`	`23`	`}`
`24`		`- // 这个条件的意思是如果上一个元素和下一个元素没有实质的换行则保持一定的空格`
	`24`	`+ // 这个条件的意思是如果上一个元素和下一个元素没有实质的换行则保持一定的空格`
`25`	`25`	`if (nextElementLine == lastElementLine && ctx.GetCharacterCount() != 0)`
`26`	`26`	`{`
`27`	`27`	`ctx.PrintBlank(_keepBlank);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ std::string RangeFormatContext::GetText()`
`76`	`76`	`{`
`77`	`77`	`std::string formattedText = FormatContext::GetText();`
`78`	`78`
`79`		`- for (int i = formattedText.size() - 1; i >= 0; i--)`
	`79`	`+ for (int i = static_cast<int>(formattedText.size()) - 1; i >= 0; i--)`
`80`	`80`	`{`
`81`	`81`	`char ch = formattedText[i];`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ int LuaTokenParser::GetColumn(int offset)`
`169`	`169`
`170`	`170`	`int bytesLength = offset - lineStartOffset;`
`171`	`171`
`172`		`- int utf8Length = ::utf8nlen(_source.data() + lineStartOffset, bytesLength);`
	`172`	`+ int utf8Length = ::utf8nlen(_source.data() + lineStartOffset, static_cast<std::size_t>(bytesLength));`
`173`	`173`	`return utf8Length;`
`174`	`174`	`}`
`175`	`175`
`@@ -188,7 +188,7 @@ bool LuaTokenParser::IsEmptyLine(int line)`
`188`	`188`	`int nextLineStartOffset = 0;`
`189`	`189`	`if (line == _linenumber)`
`190`	`190`	`{`
`191`		`- nextLineStartOffset = _source.size();`
	`191`	`+ nextLineStartOffset = static_cast<int>(_source.size());`
`192`	`192`	`}`
`193`	`193`	`else`
`194`	`194`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <cassert>`
	`1`	`+#include <cassert>`
`2`	`2`	`#include <iostream>`
`3`	`3`	`#include <filesystem>`
`4`	`4`	`#include <vector>`
`@@ -109,7 +109,7 @@ std::string ReadFile(const std::string& path)`
`109`	`109`	`return "";`
`110`	`110`	`}`
`111`	`111`
`112`		`-// 第一个参数是待格式化文本目录，第二个参数是格式化预期结果`
	`112`	`+// 第一个参数是待格式化文本目录，第二个参数是格式化预期结果`
`113`	`113`	`int main(int argc, char* argv[])`
`114`	`114`	`{`
`115`	`115`	`CommandLine commandLine;`