搭建折行基础，非标准符号基础

Author: CppCXY

CodeService/src/FormatElement/FormatContext.cpp

@@ -98,7 +98,7 @@ FormatContext::IndentState FormatContext::CalculateIndentState(int offset)
 		}
 	}
 
-	if(state.TabIndent == 0 && state.SpaceIndent == 0)
+	if (state.TabIndent == 0 && state.SpaceIndent == 0)
 	{
 		state.Style = _options.indent_style;
 	}
@@ -125,7 +125,7 @@ FormatContext::IndentState FormatContext::GetLastIndent() const
 {
 	if (_indentStack.size() < 2)
 	{
-		return IndentState{ 0, 0, _options.indent_style };
+		return IndentState{0, 0, _options.indent_style};
 	}
 
 	return _indentStack[_indentStack.size() - 2];
@@ -137,6 +137,29 @@ bool FormatContext::OnlyEmptyCharBefore(int offset)
 	return file->OnlyEmptyCharBefore(offset);
 }
 
+bool FormatContext::ShouldBreakLine(TextRange range)
+{
+	auto column = GetCharacterCount();
+	if (column == 0)
+	{
+		return false;
+	}
+
+	auto startLine = GetLine(range.StartOffset);
+	auto endLine = GetLine(range.EndOffset);
+
+	if (startLine == endLine)
+	{
+		column += GetColumn(range.EndOffset) - GetColumn(range.StartOffset);
+	}
+	else
+	{
+		column += _parser->GetLuaFile()->GetLineRestCharacter(range.StartOffset);
+	}
+
+	return column >= _options.max_line_length;
+}
+
 std::shared_ptr<LuaParser> FormatContext::GetParser()
 {
 	return _parser;

CodeService/src/FormatElement/FormatElement.cpp

@@ -219,6 +219,22 @@ void FormatElement::Reset()
 	_children.clear();
 }
 
+std::shared_ptr<FormatElement> FormatElement::GetNextValidElement(ChildIterator& it, FormatElement& parent)
+{
+	auto& siblings = parent.GetChildren();
+	++it;
+	for (; it != siblings.end(); ++it)
+	{
+		auto child = *it;
+		if (child->HasValidTextRange())
+		{
+			return child;
+		}
+	}
+
+	return nullptr;
+}
+
 int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)
 {
 	auto& siblings = parent.GetChildren();
@@ -239,16 +255,10 @@ int FormatElement::GetLastValidOffset(ChildIterator& it, FormatElement& parent)
 
 int FormatElement::GetNextValidOffset(ChildIterator& it, FormatElement& parent)
 {
-	auto& siblings = parent.GetChildren();
-	++it;
-	for (; it != siblings.end(); ++it)
+	auto nextElement = GetNextValidElement(it, parent);
+	if(nextElement)
 	{
-		auto child = *it;
-		if (child->HasValidTextRange())
-		{
-			return child->GetTextRange().StartOffset;
-		}
+		return nextElement->GetTextRange().StartOffset;
 	}
-
 	return -1;
 }

CodeService/src/FormatElement/KeepElement.cpp

@@ -17,15 +17,30 @@ void KeepElement::Serialize(SerializeContext& ctx, ChildIterator selfIt,
                             FormatElement& parent)
 {
 	const int lastElementLine = GetLastValidLine(ctx, selfIt, parent);
-	const int nextElementLine = GetNextValidLine(ctx, selfIt, parent);
+
+	const auto nextElement = GetNextValidElement(selfIt, parent);
+	if (!nextElement)
+	{
+		return;
+	}
+	const auto nextRange = nextElement->GetTextRange();
+	const int nextElementLine = ctx.GetLine(nextRange.StartOffset);
 
 	if (nextElementLine == -1)
 	{
 		return;
 	}
+
 	// 这个条件的意思是如果上一个元素和下一个元素没有实质的换行则保持一定的空格
 	if (nextElementLine == lastElementLine && ctx.GetCharacterCount() != 0)
 	{
+		// 暂时不打断
+		// if (nextElement->GetType() == FormatElementType::TextElement && ctx.ShouldBreakLine(nextRange))
+		// {
+		// 	ctx.PrintLine(1);
+		// 	return;
+		// }
+
 		ctx.PrintBlank(_keepBlank);
 	}
 	else
@@ -63,7 +78,8 @@ void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 	{
 		if (nextOffset - lastOffset - 1 != _keepBlank)
 		{
-			ctx.PushDiagnosis(Util::format(LText("here need keep {} space"), _keepBlank), TextRange(lastOffset, nextOffset), DiagnosisType::Blank);
+			ctx.PushDiagnosis(Util::format(LText("here need keep {} space"), _keepBlank),
+			                  TextRange(lastOffset, nextOffset), DiagnosisType::Blank);
 		}
 	}
 	else

CodeService/src/LuaFormatter.cpp

@@ -422,7 +422,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatLocalStatement(std::shared_pt
 			}
 		case LuaAstNodeType::NameDefList:
 			{
-				env->AddChild(FormatNode(node));
+				env->AddChild(FormatNameDefList(node));
 				break;
 			}
 		case LuaAstNodeType::ExpressionList:

LuaParser/src/LuaAstNode/LuaAstNode.cpp

@@ -1,15 +1,17 @@
 #include "LuaParser/LuaAstNode/LuaAstNode.h"
 #include "LuaParser/LuaAstVisitor.h"
 
-LuaAstNode::LuaAstNode(LuaAstNodeType type, std::string_view text, TextRange range)
+LuaAstNode::LuaAstNode(LuaAstNodeType type, std::string_view text, TextRange range, LuaTokenType tokenType)
 	: _type(type),
+	  _tokenType(tokenType),
 	  _text(text),
 	  _textRange(range)
+
 {
 }
 
 LuaAstNode::LuaAstNode(LuaAstNodeType type, LuaToken& token)
-	: LuaAstNode(type, token.Text, token.Range)
+	: LuaAstNode(type, token.Text, token.Range, token.TokenType)
 {
 }
 
@@ -111,6 +113,11 @@ LuaAstNodeType LuaAstNode::GetType() const
 	return _type;
 }
 
+LuaTokenType LuaAstNode::GetTokenType() const
+{
+	return _tokenType;
+}
+
 void LuaAstNode::AddComment(std::shared_ptr<LuaAstNode> comment)
 {
 	auto childTextRange = comment->GetTextRange();

LuaParser/src/LuaFile.cpp

@@ -235,3 +235,24 @@ EndOfLine LuaFile::GetEndOfLine() const
 {
 	return _lineState;
 }
+
+int LuaFile::GetLineRestCharacter(int offset)
+{
+	int line = GetLine(offset);
+	int bytesLength = 0;
+	if(line < static_cast<int>(_lineOffsetVec.size()) - 1)
+	{
+		auto nextOffset = _lineOffsetVec[line + 1];
+		bytesLength = nextOffset - offset;
+	}
+	else
+	{
+		bytesLength = static_cast<int>(_source.size()) - 1 - offset;
+	}
+	if (bytesLength > 0) {
+		return static_cast<int>(utf8::Utf8nLen(_source.data() + offset, static_cast<std::size_t>(bytesLength)));
+	}
+	else {
+		return 0;
+	}
+}

include/CodeService/FormatElement/FormatContext.h

@@ -40,6 +40,8 @@ class FormatContext
 
 	bool OnlyEmptyCharBefore(int offset);
 
+	bool ShouldBreakLine(TextRange range);
+
 	std::shared_ptr<LuaParser> GetParser();
 
 	LuaCodeStyleOptions& GetOptions();

include/CodeService/FormatElement/FormatElement.h

@@ -51,6 +51,8 @@ class FormatElement : public std::enable_shared_from_this<FormatElement>
 
 	void Reset();
 protected:
+	static std::shared_ptr<FormatElement> GetNextValidElement (ChildIterator& it, FormatElement& parent);
+
 	static int GetLastValidOffset(ChildIterator& it, FormatElement& parent);
 	static int GetNextValidOffset(ChildIterator& it, FormatElement& parent);
 

include/LuaParser/LuaAstNode/LuaAstNode.h

@@ -17,7 +17,7 @@ class LuaAstNode: public std::enable_shared_from_this<LuaAstNode>
 	using ChildrenContainer = std::vector<std::shared_ptr<LuaAstNode>>;
 	using ChildIterator = ChildrenContainer::iterator;
 
-	LuaAstNode(LuaAstNodeType type, std::string_view text, TextRange range);
+	LuaAstNode(LuaAstNodeType type, std::string_view text, TextRange range, LuaTokenType tokenType = 0);
 
 	LuaAstNode(LuaAstNodeType type, LuaToken& token);
 
@@ -41,6 +41,8 @@ class LuaAstNode: public std::enable_shared_from_this<LuaAstNode>
 
 	LuaAstNodeType GetType() const;
 
+	LuaTokenType GetTokenType() const;
+
 	virtual void AddComment(std::shared_ptr<LuaAstNode> comment);
 
 	std::shared_ptr<LuaAstNode> GetParent();
@@ -64,6 +66,7 @@ class LuaAstNode: public std::enable_shared_from_this<LuaAstNode>
 	void AddChildBefore(ChildIterator it, std::shared_ptr<LuaAstNode> child);
 
 	LuaAstNodeType _type;
+	LuaTokenType _tokenType;
 	std::string_view _text;
 	TextRange _textRange;
 

include/LuaParser/LuaFile.h

@@ -39,6 +39,8 @@ class LuaFile
 	void SetEndOfLineState(EndOfLine endOfLine);
 
 	EndOfLine GetEndOfLine() const;
+
+	int GetLineRestCharacter(int offset);
 protected:
 	std::string _source;
 	std::string _filename;