fix typeformat 吃掉东西的bug

Author: CppCXY

CodeService/src/TypeFormat/LuaTypeFormat.cpp

@@ -160,12 +160,12 @@ void LuaTypeFormat::AnalysisReturn(int line, int character)
 
 	if (_typeOptions.format_line)
 	{
-		FormatLine(line);
+		FormatLine(line, character);
 	}
 
-	if (_typeOptions.fix_indent) {
-		FixIndent(line, character);
-	}
+	// if (_typeOptions.fix_indent) {
+	// 	FixIndent(line, character);
+	// }
 }
 
 void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaError)
@@ -280,8 +280,21 @@ void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaErro
 	}
 }
 
-void LuaTypeFormat::FormatLine(int line)
+void LuaTypeFormat::FormatLine(int line, int character)
 {
+	auto luaFile = _parser->GetLuaFile();
+	auto offset = luaFile->GetOffsetFromPosition(line, character);
+	auto& tokens = _parser->GetTokenParser()->GetTokens();
+	auto tokenIndex = FindTokenIndexAfterPosition(tokens, offset);
+	if (tokenIndex != -1)
+	{
+		auto& token = tokens[tokenIndex];
+		if (token.TokenType == TK_STRING || token.TokenType == TK_LONG_COMMENT)
+		{
+			return;
+		}
+	}
+
 	LuaCodeStyleOptions temp = _options;
 	temp.insert_final_newline = true;
 	temp.remove_expression_list_finish_comma = false;
@@ -326,7 +339,7 @@ void LuaTypeFormat::FormatLine(int line)
 
 void LuaTypeFormat::FixIndent(int line, int character)
 {
-	// FixEndIndent(line, character);
+	FixEndIndent(line, character);
 
 	// auto root = _parser->GetAst();
 	// auto astNode = FindAstNodeBeforePosition(root, offset);

include/CodeService/TypeFormat/LuaTypeFormat.h

@@ -27,7 +27,7 @@ class LuaTypeFormat
 private:
 	void AnalysisReturn(int line, int character);
 	void CompleteMissToken(int line, int character, LuaError& luaError);
-	void FormatLine(int line);
+	void FormatLine(int line, int character);
 	void FixIndent(int line, int character);
 
 	void FixEndIndent(int line, int character);
@@ -38,3 +38,4 @@ class LuaTypeFormat
 	bool _hasResult;
 	std::vector<Result> _results;
 };
+ 

include/CodeService/TypeFormat/LuaTypeFormatOptions.h

@@ -13,3 +13,4 @@ class LuaTypeFormatOptions
 	bool auto_complete_table_sep = true;
 	bool fix_indent = true;
 };
+